platform/upstream/libav.git
14 years agoDo sequential bit reading outside of []-operators.
Thilo Borgmann [Fri, 19 Feb 2010 08:07:02 +0000 (08:07 +0000)]
Do sequential bit reading outside of []-operators.

Originally committed as revision 21892 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoWavPack demuxer supports ID3v1 tags, so don't forget id3v1.o dependency for it
Kostya Shishkov [Fri, 19 Feb 2010 06:59:47 +0000 (06:59 +0000)]
WavPack demuxer supports ID3v1 tags, so don't forget id3v1.o dependency for it
in Makefile

Originally committed as revision 21891 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoTOMI: 16- and 32-bit intreadwrite functions
Måns Rullgård [Fri, 19 Feb 2010 03:20:01 +0000 (03:20 +0000)]
TOMI: 16- and 32-bit intreadwrite functions

Originally committed as revision 21890 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoget rid of an if() 1 cpu cycle faster.
Michael Niedermayer [Fri, 19 Feb 2010 03:10:26 +0000 (03:10 +0000)]
get rid of an if() 1 cpu cycle faster.

Originally committed as revision 21889 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoGet rid of a local variable, 10 cpu cycles faster.
Michael Niedermayer [Fri, 19 Feb 2010 02:37:11 +0000 (02:37 +0000)]
Get rid of a local variable, 10 cpu cycles faster.

Originally committed as revision 21888 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove abs() from decode_cabac_mb_mvd() to the code that writes mvd_cache.
Michael Niedermayer [Thu, 18 Feb 2010 23:37:48 +0000 (23:37 +0000)]
Move abs() from decode_cabac_mb_mvd() to the code that writes mvd_cache.
4-8 cycles faster

Originally committed as revision 21887 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd some AAC buffer overread checks.
Alex Converse [Thu, 18 Feb 2010 23:06:56 +0000 (23:06 +0000)]
Add some AAC buffer overread checks.

Originally committed as revision 21886 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoReindent and fix brace placement.
Stefano Sabatini [Thu, 18 Feb 2010 21:20:37 +0000 (21:20 +0000)]
Reindent and fix brace placement.

Originally committed as revision 30643 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

14 years agoVertically align a list of comparisons in sws_getCachedContext().
Stefano Sabatini [Thu, 18 Feb 2010 21:17:07 +0000 (21:17 +0000)]
Vertically align a list of comparisons in sws_getCachedContext().

Originally committed as revision 30642 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

14 years agoMerge two if conditions, allow to decrese the level of indentation of
Stefano Sabatini [Thu, 18 Feb 2010 21:12:05 +0000 (21:12 +0000)]
Merge two if conditions, allow to decrese the level of indentation of
the block.

Originally committed as revision 30641 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

14 years agoFFmpeg is a collective effort so allowing a single name in a banner is
Stefano Sabatini [Thu, 18 Feb 2010 20:47:20 +0000 (20:47 +0000)]
FFmpeg is a collective effort so allowing a single name in a banner is
not nice/fair towards the community of developers.

Also this looks like the best way for resolving the debate about which
is the one person name to be put in the banner.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Replace "Fabrice Bellard" with "the FFmpeg developers" in  the banner
Date: Thu, 11 Feb 2010 23:59:12 +0100

Originally committed as revision 21885 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSuppress icc warnings about unknown attributes
Måns Rullgård [Thu, 18 Feb 2010 19:14:48 +0000 (19:14 +0000)]
Suppress icc warnings about unknown attributes

Originally committed as revision 21884 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agofix intra prediction modes with inter-MB neighbors,
Stefan Gehrer [Thu, 18 Feb 2010 18:23:48 +0000 (18:23 +0000)]
fix intra prediction modes with inter-MB neighbors,
the old sample clips are in violation of the 2006 spec

Originally committed as revision 21883 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMake RTMP client send bytes read report
Kostya Shishkov [Thu, 18 Feb 2010 16:27:18 +0000 (16:27 +0000)]
Make RTMP client send bytes read report

Originally committed as revision 21882 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoH264: use alias-safe macros
Måns Rullgård [Thu, 18 Feb 2010 16:24:31 +0000 (16:24 +0000)]
H264: use alias-safe macros

This eliminates all aliasing violation warnings in h264 code.
No measurable speed difference with gcc-4.4.3 on i7.

Originally committed as revision 21881 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd alias-safe aligned AV_[RW]N macros
Måns Rullgård [Thu, 18 Feb 2010 13:44:38 +0000 (13:44 +0000)]
Add alias-safe aligned AV_[RW]N macros

Originally committed as revision 21880 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoUse alias-safe types in AV_COPY/SWAP/ZERO macros
Måns Rullgård [Thu, 18 Feb 2010 13:40:24 +0000 (13:40 +0000)]
Use alias-safe types in AV_COPY/SWAP/ZERO macros

Originally committed as revision 21879 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoUse alias-safe types in AV_[RW] macros
Måns Rullgård [Thu, 18 Feb 2010 13:40:21 +0000 (13:40 +0000)]
Use alias-safe types in AV_[RW] macros

Originally committed as revision 21878 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd alias-safe union typedefs
Måns Rullgård [Thu, 18 Feb 2010 13:40:19 +0000 (13:40 +0000)]
Add alias-safe union typedefs

Originally committed as revision 21877 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSimplify deblock_left/top condition for deblocking_filter=2
Michael Niedermayer [Thu, 18 Feb 2010 12:37:43 +0000 (12:37 +0000)]
Simplify deblock_left/top condition for deblocking_filter=2

Originally committed as revision 21876 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSpeedup decode_cabac_field_decoding_flag() by 9 cpu cycles.
Michael Niedermayer [Thu, 18 Feb 2010 12:13:21 +0000 (12:13 +0000)]
Speedup decode_cabac_field_decoding_flag() by 9 cpu cycles.

Originally committed as revision 21875 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agofix issue 1747
Michael Niedermayer [Thu, 18 Feb 2010 00:19:50 +0000 (00:19 +0000)]
fix issue 1747

Originally committed as revision 21874 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove NEG_[US]SR32 macros to mathops.h
Måns Rullgård [Wed, 17 Feb 2010 23:58:59 +0000 (23:58 +0000)]
Move NEG_[US]SR32 macros to mathops.h

Originally committed as revision 21873 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoFix sizeof()-statement to use the actual pointer type.
Thilo Borgmann [Wed, 17 Feb 2010 23:26:48 +0000 (23:26 +0000)]
Fix sizeof()-statement to use the actual pointer type.

Originally committed as revision 21872 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoFix wrong buffer allocation for MCC in ALS.
Thilo Borgmann [Wed, 17 Feb 2010 22:53:25 +0000 (22:53 +0000)]
Fix wrong buffer allocation for MCC in ALS.

Originally committed as revision 21871 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoUse stripped executable in regression tests
Måns Rullgård [Wed, 17 Feb 2010 21:37:35 +0000 (21:37 +0000)]
Use stripped executable in regression tests

Originally committed as revision 21870 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoconfigure: allow setting strip tool with --strip
Måns Rullgård [Wed, 17 Feb 2010 21:37:33 +0000 (21:37 +0000)]
configure: allow setting strip tool with --strip

Originally committed as revision 21869 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoget_bits: Fix spelling and grammar in GET_VLC() comment.
Alex Converse [Wed, 17 Feb 2010 21:20:43 +0000 (21:20 +0000)]
get_bits: Fix spelling and grammar in GET_VLC() comment.

Originally committed as revision 21868 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years ago10l: remove stray '(' I don't know where it came from
Måns Rullgård [Wed, 17 Feb 2010 21:04:56 +0000 (21:04 +0000)]
10l: remove stray '(' I don't know where it came from

Originally committed as revision 21867 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoUse LOCAL_ALIGNED macro for local arrays
Måns Rullgård [Wed, 17 Feb 2010 20:36:20 +0000 (20:36 +0000)]
Use LOCAL_ALIGNED macro for local arrays

Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoPPC and x86 support aligning variables on stack
Måns Rullgård [Wed, 17 Feb 2010 20:36:15 +0000 (20:36 +0000)]
PPC and x86 support aligning variables on stack

Originally committed as revision 21865 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd LOCAL_ALIGNED() macro for declaring aligned local arrays
Måns Rullgård [Wed, 17 Feb 2010 20:36:12 +0000 (20:36 +0000)]
Add LOCAL_ALIGNED() macro for declaring aligned local arrays

Originally committed as revision 21864 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSimplify some declarations of aligned arrays
Måns Rullgård [Wed, 17 Feb 2010 20:36:10 +0000 (20:36 +0000)]
Simplify some declarations of aligned arrays

If DECLARE_ALIGNED_16 works on uint64_t it will work smaller types too.

Originally committed as revision 21863 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd functions to send RTSP commands with content attached to them. This will
Martin Storsjö [Wed, 17 Feb 2010 19:24:02 +0000 (19:24 +0000)]
Add functions to send RTSP commands with content attached to them. This will
be used eventually in the RTSP muxer (see thread "[PATCH] RTSP muxer, round
3" on mailinglist).

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21862 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
Michael Niedermayer [Wed, 17 Feb 2010 02:25:05 +0000 (02:25 +0000)]
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
there as well.

Originally committed as revision 21861 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove check for and call of predict_field_decoding_flag() from the mb code to
Michael Niedermayer [Wed, 17 Feb 2010 02:14:02 +0000 (02:14 +0000)]
Move check for and call of predict_field_decoding_flag() from the mb code to
the row code. This function would only be needed on a MB basis for MBAFF+FMO

Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years ago2x faster ff_h264_init_cabac_states(), 4k cpu cycles less.
Michael Niedermayer [Tue, 16 Feb 2010 23:43:08 +0000 (23:43 +0000)]
2x faster ff_h264_init_cabac_states(), 4k cpu cycles less.
Sadly this is just per slice so the speedup with normal files should be negligible.

Originally committed as revision 21859 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRemove first_rtcp_ntp_time. This is used to prevent overflow of the timestamp,
Ronald S. Bultje [Tue, 16 Feb 2010 23:00:03 +0000 (23:00 +0000)]
Remove first_rtcp_ntp_time. This is used to prevent overflow of the timestamp,
but doesn't actually do that. What's worse, it creates timestamp adjustments
that are different per stream within a session, leading to a/v sync issues.

See discussion in thread "[FFmpeg-devel] rtp streaming x264+audio issues (and
some ideas to fix them)". Patch suggested by Luca Abeni <lucabe72 email it>.

Originally committed as revision 21857 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoWhen using RTP-over-UDP, send dummy packets during stream setup, similar to
Martin Storsjö [Tue, 16 Feb 2010 22:50:50 +0000 (22:50 +0000)]
When using RTP-over-UDP, send dummy packets during stream setup, similar to
what e.g. RealPlayer does. This allows proper port forwarding setup in NAT-
based environments.

Patch by Martin Storsjö <$firstname at $firstname dot st>.

Originally committed as revision 21856 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRename the "enc" variable, which refers to the AVCodecContext of a
Stefano Sabatini [Tue, 16 Feb 2010 22:38:43 +0000 (22:38 +0000)]
Rename the "enc" variable, which refers to the AVCodecContext of a
decoder, to "avctx".

See the thread:
Subject: [FFmpeg-devel] [PATCH] enc is not a good name for a decoder context
Date: Mon, 28 Dec 2009 22:56:25 +0100

Originally committed as revision 21855 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove read_line() and write_line() definition from pixdesc.h to
Stefano Sabatini [Tue, 16 Feb 2010 20:17:50 +0000 (20:17 +0000)]
Move read_line() and write_line() definition from pixdesc.h to
pixdesc.c, which are now not anymore marked as static inline.

Fix the inclusion of the private header intreadwrite.h in the public
header pixdesc.h.

Originally committed as revision 21854 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoFix two problems (no idea how this ever worked):
Ronald S. Bultje [Tue, 16 Feb 2010 19:26:49 +0000 (19:26 +0000)]
Fix two problems (no idea how this ever worked):
- the return value of url_open_dyn_*buf() is 0 on success, so using
   if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before
   each piece of data. Feeding this to the ASF demuxer will never work.
   Therefore, use url_open_dyn_buf() instead.

Originally committed as revision 21853 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRevert r21851.
Ronald S. Bultje [Tue, 16 Feb 2010 18:25:05 +0000 (18:25 +0000)]
Revert r21851.

Originally committed as revision 21852 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDon't return 0 if buffer setup failed. That signals the RTSP demuxer that
Ronald S. Bultje [Tue, 16 Feb 2010 18:19:28 +0000 (18:19 +0000)]
Don't return 0 if buffer setup failed. That signals the RTSP demuxer that
the packet was filled in, leading to virtually random behaviour in the
decoder later on. Instead, return a negative value.

Originally committed as revision 21851 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSet lavf identification string globally in av_write_header(), rather
Anton Khirnov [Tue, 16 Feb 2010 16:32:25 +0000 (16:32 +0000)]
Set lavf identification string globally in av_write_header(), rather
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoLimit the Rice parameter used for progressive decoding in ALS.
Thilo Borgmann [Tue, 16 Feb 2010 14:48:01 +0000 (14:48 +0000)]
Limit the Rice parameter used for progressive decoding in ALS.

Originally committed as revision 21849 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd lsp.o as a dependency for wmavoice. This fixes a compilation error when
James Darnley [Tue, 16 Feb 2010 14:33:13 +0000 (14:33 +0000)]
Add lsp.o as a dependency for wmavoice. This fixes a compilation error when
you disable lots of stuff (in particular other voice codecs) but leave
wmavoice enabled.

Patch by James Darnley <$firstname dot $lastname at gmail dot com>.

Originally committed as revision 21848 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSupport IFF ANNO (annotation) chunk type
Peter Ross [Tue, 16 Feb 2010 09:55:56 +0000 (09:55 +0000)]
Support IFF ANNO (annotation) chunk type

Originally committed as revision 21847 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSupport <8-bit ILBM uncompressed bitmaps
Peter Ross [Tue, 16 Feb 2010 09:33:59 +0000 (09:33 +0000)]
Support <8-bit ILBM uncompressed bitmaps

Originally committed as revision 21846 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years ago2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()
Michael Niedermayer [Tue, 16 Feb 2010 02:51:37 +0000 (02:51 +0000)]
2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()

Originally committed as revision 21845 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDrop a few redundant slice_num checks.
Michael Niedermayer [Tue, 16 Feb 2010 00:09:30 +0000 (00:09 +0000)]
Drop a few redundant slice_num checks.

Originally committed as revision 21844 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDrop compute_mb_neighbors() and move fill_decode_neighbors() up to take its
Michael Niedermayer [Mon, 15 Feb 2010 23:04:07 +0000 (23:04 +0000)]
Drop compute_mb_neighbors() and move fill_decode_neighbors() up to take its
role.
Should be faster as this is a strict code removial.

Originally committed as revision 21843 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSplit setting neighboring MBs from fill_decode_caches()
Michael Niedermayer [Mon, 15 Feb 2010 22:07:02 +0000 (22:07 +0000)]
Split setting neighboring MBs from fill_decode_caches()
no speed change.

Originally committed as revision 21842 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoStrings in extended content header are UTF16,
Anton Khirnov [Mon, 15 Feb 2010 21:19:40 +0000 (21:19 +0000)]
Strings in extended content header are UTF16,
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21841 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoworkaround for broken files created by previous versions of asfenc.
Anton Khirnov [Mon, 15 Feb 2010 21:14:47 +0000 (21:14 +0000)]
workaround for broken files created by previous versions of asfenc.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21840 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSimplify decode_cabac_mb_intra4x4_pred_mode().
Michael Niedermayer [Mon, 15 Feb 2010 19:22:09 +0000 (19:22 +0000)]
Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed

Originally committed as revision 21839 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMerge decode_cabac_mb_type_b() into calling code.
Michael Niedermayer [Mon, 15 Feb 2010 19:20:49 +0000 (19:20 +0000)]
Merge decode_cabac_mb_type_b() into calling code.
This avoids a conditional branch and is about 3 cpu cyclues faster.

Originally committed as revision 21838 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRemove outdated comment.
Maxim Poliakovski [Mon, 15 Feb 2010 17:37:38 +0000 (17:37 +0000)]
Remove outdated comment.

Patch by Maxim, max_pole gmx de

Originally committed as revision 21837 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoadd heuristic to discern the old sample clips from streams encoded
Stefan Gehrer [Mon, 15 Feb 2010 16:43:45 +0000 (16:43 +0000)]
add heuristic to discern the old sample clips from streams encoded
with rm52j encoder, a marker_bit has been added in the I-Frame syntax

Originally committed as revision 21836 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoavoid using DECLARE_ALIGNED on stack variable as suggested by Reimar
Stefan Gehrer [Mon, 15 Feb 2010 16:37:13 +0000 (16:37 +0000)]
avoid using DECLARE_ALIGNED on stack variable as suggested by Reimar

Originally committed as revision 21835 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAAC: Mark che_configure() as av_cold.
Alex Converse [Mon, 15 Feb 2010 16:29:46 +0000 (16:29 +0000)]
AAC: Mark che_configure() as av_cold.

It is also only called when the output configuration is not locked.

Originally committed as revision 21834 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAAC: Mark functions that are only called when the output configuration is not locked...
Alex Converse [Mon, 15 Feb 2010 16:19:46 +0000 (16:19 +0000)]
AAC: Mark functions that are only called when the output configuration is not locked as av_cold.

Originally committed as revision 21833 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoIFF bitmap n-bit color support
Peter Ross [Mon, 15 Feb 2010 11:26:35 +0000 (11:26 +0000)]
IFF bitmap n-bit color support

Originally committed as revision 21831 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years ago10l ;; gcc 2.95 compilation fix by mike
Michael Niedermayer [Mon, 15 Feb 2010 09:11:00 +0000 (09:11 +0000)]
10l ;; gcc 2.95 compilation fix by mike

Originally committed as revision 21830 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years ago10l use pack16to32(), should fix big endian h264 failures.
Michael Niedermayer [Mon, 15 Feb 2010 01:24:50 +0000 (01:24 +0000)]
10l use pack16to32(), should fix big endian h264 failures.

Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMerge the single line function decode_cabac_mb_transform_size()
Michael Niedermayer [Mon, 15 Feb 2010 01:04:07 +0000 (01:04 +0000)]
Merge the single line function decode_cabac_mb_transform_size()
into the calling code.
8 cpu cycles faster

Originally committed as revision 21828 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoindent
Michael Niedermayer [Sun, 14 Feb 2010 23:10:02 +0000 (23:10 +0000)]
indent

Originally committed as revision 21827 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMerge decode_cabac_mb_dqp() with surronding code.
Michael Niedermayer [Sun, 14 Feb 2010 23:06:25 +0000 (23:06 +0000)]
Merge decode_cabac_mb_dqp() with surronding code.
~20 cpu cycles faster

Originally committed as revision 21826 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDrop if(0) code.
Michael Niedermayer [Sun, 14 Feb 2010 22:59:19 +0000 (22:59 +0000)]
Drop if(0) code.

Originally committed as revision 21825 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoReindent
Reimar Döffinger [Sun, 14 Feb 2010 19:00:36 +0000 (19:00 +0000)]
Reindent

Originally committed as revision 21824 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoOptimize h261_probe function, since it is far slower than all others.
Reimar Döffinger [Sun, 14 Feb 2010 18:59:56 +0000 (18:59 +0000)]
Optimize h261_probe function, since it is far slower than all others.
About 5 times faster.

Originally committed as revision 21823 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSet sub_mb_type in direct_cache instead of just the direct flag.
Michael Niedermayer [Sun, 14 Feb 2010 16:51:31 +0000 (16:51 +0000)]
Set sub_mb_type in direct_cache instead of just the direct flag.
Simpler, cleaner and faster.

Originally committed as revision 21822 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoStore sub_mb_type in direct_cache/direct_table.
Michael Niedermayer [Sun, 14 Feb 2010 14:41:27 +0000 (14:41 +0000)]
Store sub_mb_type in direct_cache/direct_table.
This is equal complexity but could be more usefull.

Originally committed as revision 21821 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd myself as maintainer of bgmc.[ch].
Thilo Borgmann [Sun, 14 Feb 2010 10:17:58 +0000 (10:17 +0000)]
Add myself as maintainer of bgmc.[ch].

Originally committed as revision 21820 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRemove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so
Michael Niedermayer [Sun, 14 Feb 2010 02:08:48 +0000 (02:08 +0000)]
Remove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so
these checks arent needed.

Originally committed as revision 21819 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoRevert r21814
Michael Niedermayer [Sun, 14 Feb 2010 02:04:41 +0000 (02:04 +0000)]
Revert r21814
Log:
h264: Fix pointer warnings by removing redundant [0]

Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type

Reason: breaks h264 decoding & fate

Originally committed as revision 21818 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoCosmetics, vertical align.
Michael Niedermayer [Sun, 14 Feb 2010 01:14:05 +0000 (01:14 +0000)]
Cosmetics, vertical align.

Originally committed as revision 21817 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDirect temporal skiped MBs dont need fill_decode_caches() at all so dont call it
Michael Niedermayer [Sat, 13 Feb 2010 22:53:44 +0000 (22:53 +0000)]
Direct temporal skiped MBs dont need fill_decode_caches() at all so dont call it
for them.

Originally committed as revision 21816 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoh264: Remove unused variables.
Alexander Strange [Sat, 13 Feb 2010 21:09:38 +0000 (21:09 +0000)]
h264: Remove unused variables.

Originally committed as revision 21815 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoh264: Fix pointer warnings by removing redundant [0]
Alexander Strange [Sat, 13 Feb 2010 21:08:17 +0000 (21:08 +0000)]
h264: Fix pointer warnings by removing redundant [0]

Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type

Originally committed as revision 21814 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoFix integer overflow warnings in h264.h
Alexander Strange [Sat, 13 Feb 2010 20:57:13 +0000 (20:57 +0000)]
Fix integer overflow warnings in h264.h

Fixes:
h264.h: In function 'fill_filter_caches':
h264.h:1216:73: warning: integer overflow in expression
h264.h:1307:81: warning: integer overflow in expression

Originally committed as revision 21813 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMerge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)
Michael Niedermayer [Sat, 13 Feb 2010 20:13:54 +0000 (20:13 +0000)]
Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)

Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSkiped MBs dont need the cbp stuff so skip initing that.
Michael Niedermayer [Sat, 13 Feb 2010 20:13:10 +0000 (20:13 +0000)]
Skiped MBs dont need the cbp stuff so skip initing that.

Originally committed as revision 21811 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoReindent a line.
Thilo Borgmann [Sat, 13 Feb 2010 19:59:53 +0000 (19:59 +0000)]
Reindent a line.

Originally committed as revision 21810 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAlso skip direct/mvd_cache init for skiped blocks.
Michael Niedermayer [Sat, 13 Feb 2010 19:39:18 +0000 (19:39 +0000)]
Also skip direct/mvd_cache init for skiped blocks.
Odd thing is i thought ive tryed this already and it failed previously.

Originally committed as revision 21809 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd myself as contributor.
Thilo Borgmann [Sat, 13 Feb 2010 19:24:32 +0000 (19:24 +0000)]
Add myself as contributor.

Originally committed as revision 21808 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoAdd myself as ALS maintainer.
Thilo Borgmann [Sat, 13 Feb 2010 19:23:39 +0000 (19:23 +0000)]
Add myself as ALS maintainer.

Originally committed as revision 21807 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove more code under if(!IS_DIRECT(mb_type)).
Michael Niedermayer [Sat, 13 Feb 2010 19:00:51 +0000 (19:00 +0000)]
Move more code under if(!IS_DIRECT(mb_type)).

Originally committed as revision 21806 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove CODEC_FLAG_GRAY check to outer loop
David Conrad [Sat, 13 Feb 2010 18:59:25 +0000 (18:59 +0000)]
Move CODEC_FLAG_GRAY check to outer loop

Originally committed as revision 21805 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove branch based on custom mode outside the loop
David Conrad [Sat, 13 Feb 2010 18:59:21 +0000 (18:59 +0000)]
Move branch based on custom mode outside the loop

Originally committed as revision 21804 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDirectly check whether a fragment is coded for 4MV mode instead of iterating
David Conrad [Sat, 13 Feb 2010 18:55:27 +0000 (18:55 +0000)]
Directly check whether a fragment is coded for 4MV mode instead of iterating
through the entire coded fragment list.

Originally committed as revision 21803 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoEliminate fragment -> macroblock mapping array
David Conrad [Sat, 13 Feb 2010 18:55:24 +0000 (18:55 +0000)]
Eliminate fragment -> macroblock mapping array

Originally committed as revision 21802 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoEliminate macroblock -> fragment mapping array
David Conrad [Sat, 13 Feb 2010 18:55:21 +0000 (18:55 +0000)]
Eliminate macroblock -> fragment mapping array

Originally committed as revision 21801 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoEliminate superblock <-> macroblock mapping array
David Conrad [Sat, 13 Feb 2010 18:55:17 +0000 (18:55 +0000)]
Eliminate superblock <-> macroblock mapping array

Originally committed as revision 21800 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSupport arithmetic decoding in ALS.
Thilo Borgmann [Sat, 13 Feb 2010 18:24:13 +0000 (18:24 +0000)]
Support arithmetic decoding in ALS.

Originally committed as revision 21799 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoSkip some more code that isnt needed for direct MBs.
Michael Niedermayer [Sat, 13 Feb 2010 18:23:46 +0000 (18:23 +0000)]
Skip some more code that isnt needed for direct MBs.

Originally committed as revision 21798 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoadd netspeak gsm and truespeech wav format tags to riff.c
Ben Littler [Sat, 13 Feb 2010 17:57:24 +0000 (17:57 +0000)]
add netspeak gsm and truespeech wav format tags to riff.c

Originally committed as revision 21797 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoFix reading beyond buffer end on RA144Context.lpc_tables.
Francesco Lavra [Sat, 13 Feb 2010 17:42:58 +0000 (17:42 +0000)]
Fix reading beyond buffer end on RA144Context.lpc_tables.

Patch by Francesco Lavra (francescolavra -at- interfree -dot- it)

Originally committed as revision 21796 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoDo not call lseek() with invalid whence value
Måns Rullgård [Sat, 13 Feb 2010 16:56:37 +0000 (16:56 +0000)]
Do not call lseek() with invalid whence value

Originally committed as revision 21795 to svn://svn.ffmpeg.org/ffmpeg/trunk

14 years agoMove setting MB_TYPE_L0L1 for direct MBs up, this is simpler.
Michael Niedermayer [Sat, 13 Feb 2010 15:57:49 +0000 (15:57 +0000)]
Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.

Originally committed as revision 21794 to svn://svn.ffmpeg.org/ffmpeg/trunk