Michael Niedermayer
b000b86e1d
Merge remote branch 'qatar/master'
...
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 03:30:24 +02:00
Ronald S. Bultje
18b6a69ce9
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
...
This reverts commit f8bed30d8b
. The reason
for this is that the overlap filter, which runs after IDCT, should run
on unclamped values, and thus IDCT and put_pixels() cannot be merged if
we want to attempt to be bitexact.
2011-05-04 07:40:01 -04:00
Stefano Sabatini
ce5e49b0c2
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-02 12:18:44 +02:00
Michael Niedermayer
ab8cfd45f8
Merge remote branch 'qatar/master'
...
* qatar/master:
avio: add more documentation for AVIOContext.
Parse sprite data for WMVP and WVP2, and decode sprites for the latter
Replace outdated info on the FAQ
Redefine sameq
pad: fix example explanation
gradfun: add notice from the MPlayer manual
eval: add support for trunc, ceil, and floor functions
documentation: add setdar and setsar description to filters.texi
avio: document some members of AVIOContext.
avio: document avio_close().
avio: cosmetics, vertically align comments.
avio: cosmetics, group the reading functions.
avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
avio: cosmetics, move AVIOContext to start of the file.
avio: update file header.
os: fix OpenBSD/PowerPC compilation
pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
oggdec: fix demuxing chained audio streams
fix typo
Conflicts:
doc/filters.texi
libavformat/avio.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-11 04:08:08 +02:00
Alberto Delmás
768c525114
Parse sprite data for WMVP and WVP2, and decode sprites for the latter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-10 10:07:49 +02:00
Alexandre Colucci
2506ad9f17
Fix VC-1 playback with pulldown content
...
The attached patch fixes the jerky playback of VC-1 content with pulldown. The pulldown flags were incorrectly set. They must be correct in order to display the frames with the correct timing as mentioned in the specifications: "SMPTE 421M: VC-1 Compressed Video Bitstream Format and Decoding Process". More precisely the following tables:
Table 20: Progressive P picture layer bitstream for Advanced Profile
Table 22: Progressive B picture layer bitstream for Advanced Profile
Table 23: Progressive Skipped picture layer bitstream for Advanced Profile
Table 82: Interlaced Frame I and BI picture layer bitstream for Advanced Profile
Table 83: Interlaced Frame P picture layer bitstream for Advanced Profile
Table 84: Interlaced Frame B picture layer bitstream for Advanced Profile
Table 85: Picture Layer bitstream for Field 1 of Interlace Field Picture for Advanced Profile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04 15:35:03 +02:00
Michael Niedermayer
4fa0e24736
Merge remote-tracking branch 'newdev/master'
...
* newdev/master: (33 commits)
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Add kbdwin.o to AC3 decoder
Detect byte-swapped AC-3 and support decoding it directly.
cosmetics: indentation
Always copy input data for AC3 decoder.
ac3enc: make sym_quant() branch-free
cosmetics: indentation
Add a CPU flag for the Atom processor.
id3v2: skip broken tags with invalid size
id3v2: don't explicitly skip padding
Make sure kbhit() is in conio.h
fate: update wmv8-drm reference
vc1: make P-frame deblock filter bit-exact.
configure: Add the -D parameter to the dlltool command
amr: Set the AVFMT_GENERIC_INDEX flag
amr: Set the pkt->pos field properly to the start of the packet
amr: Set the codec->bit_rate field based on the last packet
rtsp: Specify unicast for TCP interleaved streams, too
Set the correct target for mingw64 dlltool
applehttp: Change the variable for stream position in seconds into int64_t
...
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/ac3dec.c
libavformat/avio.h
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23 02:42:56 +01:00
Ronald S. Bultje
72452cc475
vc1: warn for unimplemented pan-scan feature.
2011-03-21 09:43:21 -04:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Ronald S. Bultje
6a786b15c3
VC1: merge idct8x8, coeff adjustments and put_pixels.
...
Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
(cherry picked from commit f8bed30d8b
)
2011-02-22 02:44:36 +01:00
Ronald S. Bultje
f8bed30d8b
VC1: merge idct8x8, coeff adjustments and put_pixels.
...
Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
2011-02-21 10:23:44 -05:00
Ronald S. Bultje
9a1ced321b
dsputil: move VC1-specific stuff into VC1DSPContext.
...
(cherry picked from commit 12802ec060
)
2011-02-18 19:52:40 +01:00
Ronald S. Bultje
12802ec060
dsputil: move VC1-specific stuff into VC1DSPContext.
2011-02-17 17:35:35 -05:00
Stefan Kost
3e2a4e91bd
logging: downgrade recoverable errors to warnings
...
In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ae2104791f
)
2011-02-09 03:33:54 +01:00
Stefan Kost
ae2104791f
logging: downgrade recoverable errors to warnings
...
In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-08 17:49:35 +00:00
Kostya Shishkov
cba322d76d
Make WMV3 decoder attempt to decode WMVP as well
...
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 13:56:50 +00:00
Kostya Shishkov
10f93363b7
RES_SM in WMV3 is really two flags, so split it in decoder
...
Originally committed as revision 25208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 13:54:35 +00:00
Kostya Shishkov
42ff9d7a58
Make WMV3 decoder print more errors when decoding beta WMV9 files.
...
As a side effect it will also decode a lot of P-frames from those.
Originally committed as revision 24161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 14:36:53 +00:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Kostya Shishkov
9e553f7acc
Print error message when true interlaced VC-1 frames are encountered
...
to inform user why decoder produces no output.
Originally committed as revision 20196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-10 07:35:31 +00:00
Jason Garrett-Glaser
4f717c69ed
idct_dc for VC-1/WMV3 decoder; ~11% faster decoding overall.
...
Includes mmx2 asm for the various functions.
Note that the actual idct still does not have an x86 SIMD implemtation.
For wmv3 files using regular idct, the decoder just falls back to simple_idct,
since simple_idct_dc doesn't exist (yet).
Originally committed as revision 19204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 09:00:55 +00:00
Jason Garrett-Glaser
41faa87886
Fix typo in vc1.c, make capitalization in warning/error messages more consistent.
...
Originally committed as revision 19203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 00:48:07 +00:00
Diego Biurrun
b761659bef
Split decoder-specific code off from vc1.c into vc1dec.c and keep code
...
shared between decoder and parser in vc1.c.
Originally committed as revision 19152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 09:31:31 +00:00
Baptiste Coudurier
35b2c65756
vc1 and wmv3 decoders use MPV_frame_start which uses get_buffer, set CODEC_CAP_DR1
...
Originally committed as revision 19111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:53:39 +00:00
Baptiste Coudurier
87e302bfd8
remove unused hack which set AVCodecContext frame_number to pic timestamp
...
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:24:20 +00:00
Baptiste Coudurier
2d05bc8641
set pict_type in VC-1 parser, fix some timestamps problems
...
Originally committed as revision 18987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:09:00 +00:00
David Conrad
ebcf3b742b
Ensure that we don't read from invalid memory with B-frame qpel
...
Originally committed as revision 18839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 07:49:59 +00:00
Benjamin Larsson
10c773c12f
Remove dead assignments found by CSA
...
Originally committed as revision 18730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-02 09:08:40 +00:00
Kostya Shishkov
b750fb6945
Display dimensions should not affect the real size of coded frame, thus set
...
only avctx->{width,height} and don't touch coded_{width,height} when parsing
them. This fixes the case when coded and display dimensions differ by more
than one macroblock.
Originally committed as revision 18665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-23 07:14:02 +00:00
Kostya Shishkov
21fce71fd1
Switch VLC tables in WMV3/VC-1 decoder to new static init method
...
Originally committed as revision 18658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 05:20:31 +00:00
Kostya Shishkov
f7cf12b209
Set flag after VC-1 VLCs are initialized to avoid race condition
...
Originally committed as revision 18639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 05:42:22 +00:00
Kostya Shishkov
346802aa99
Remove some useless assignments and variables found by Clang
...
Originally committed as revision 18638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 05:24:50 +00:00
David Conrad
2d08f9ea54
VC1 loop filter uses the frame quantizer not the mb quantizer
...
Originally committed as revision 18534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 07:34:52 +00:00
David Conrad
3992526b3c
Split VC1 loop filter into separate functions for h/v and size
...
Originally committed as revision 18521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 06:22:17 +00:00
David Conrad
0e58865d6e
Move VC1 loop filter to DSPContext
...
Originally committed as revision 18520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 06:20:22 +00:00
David Conrad
8013da7364
VC1: add and use avg_no_rnd chroma MC functions
...
Originally committed as revision 18518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 23:56:10 +00:00
David Conrad
c374691b28
Rename put_no_rnd_h264_chroma* to reflect its usage in VC1 only
...
Originally committed as revision 18517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 23:55:39 +00:00
David Conrad
6cecd63005
VC1: Do qpel when needed for both MVs in a B frame
...
Originally committed as revision 18511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 19:26:33 +00:00
Carl Eugen Hoyos
e161e007be
Use INIT_VLC_USE_STATIC and not its value "1".
...
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 11:47:15 +00:00
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
David Conrad
828775e160
Remove unused FILTSIGN macro
...
Originally committed as revision 18300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 08:06:30 +00:00
Gwenole Beauchesne
bb691a6da4
Add support for HW accelerated VC-1 decoding through the new
...
AVHWAccel infrastructure.
Originally committed as revision 18135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 23:44:21 +00:00
Carl Eugen Hoyos
1a022c2fbf
Apply correct pix_fmts to WMV3_VDPAU and VC1_VDPAU.
...
Originally committed as revision 17594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 23:58:52 +00:00
Carl Eugen Hoyos
ac00575d92
Fix VC1 and WMV3 playback in MPlayer.
...
Originally committed as revision 17587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 15:43:53 +00:00
Gwenole Beauchesne
4daa41c415
Rename buf_vdpau to buf_start
...
Patch by Gwenole Beauchesne <g$lastname> <at> <(antonym of "joined")-desktop><com>
Originally committed as revision 17561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 17:09:57 +00:00
Michael Niedermayer
c269cf68a0
Approved hunks for VAAPI / our new shiny hwaccel API
...
by Gwenole Beauchesne gbeauchesne splitted desktop com
Originally committed as revision 17539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-23 13:35:52 +00:00
Diego Biurrun
de86157836
cosmetics: 'void/int inline' --> 'inline void/int' to avoid warnings of the type
...
"'inline' is not at beginning of declaration" with -Wextra.
Originally committed as revision 17392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-17 12:11:46 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Gwenole Beauchesne
f92a6c66ed
Record B-fraction index from frame header and two fields from entry point structure
...
into VC-1 context.
Patch by Gwenole Beauchesne
(gbeauchesne <whirlpool> splitted <dash> desktop <dit> com)
Thread [PATCH][VC-1] Record extra syntax elements for VA API support
Originally committed as revision 16859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-30 17:15:08 +00:00
Kostya Shishkov
81169111ef
Fix Doxygen comments for VC-1 decoder.
...
Originally committed as revision 16843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28 07:16:52 +00:00
Stefan Gehrer
3e7233688a
avoid duplication of size_table and offset_table
...
Originally committed as revision 16743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 14:28:08 +00:00
Kostya Shishkov
1cae2ef9a6
Remove the block with always false condition from vc1_parse_frame_header()
...
Originally committed as revision 16726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 06:33:04 +00:00
Kostya Shishkov
a28d522491
VC-1 postproc field is 2 bits wide while decoder read only single bit.
...
Spotted by Stephen Warren.
Originally committed as revision 16725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 06:31:17 +00:00
Carl Eugen Hoyos
27052238c0
Cosmetics: Fix indentation after last commit.
...
Originally committed as revision 16700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:36:28 +00:00
NVIDIA Corporation
c5b42f4a80
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
...
be used by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:28:36 +00:00
Aurelien Jacobs
199436b952
moves mid_pred() into mathops.h (with arch specific code split by directory)
...
Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 22:57:40 +00:00
Jason Garrett-Glaser
5a44906d8e
Fix 10L in r16670 (broke deblocking code)
...
Originally committed as revision 16671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 07:20:12 +00:00
Jason Garrett-Glaser
0a359cf157
Faster VC-1 C loopfilter using lots of xor magic
...
Originally committed as revision 16670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 07:14:36 +00:00
Kostya Shishkov
7a96cd3123
VC-1 display dimensions should affect coded dimensions only (I think)
...
Originally committed as revision 16578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 08:05:40 +00:00
Kostya Shishkov
e9ca5f0892
Print VC-1 aspect ratio in debug
...
Originally committed as revision 16577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 08:03:45 +00:00
Kostya Shishkov
820089cb06
421l: fix loop filter for P-frames in VC-1
...
Originally committed as revision 16576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 08:02:31 +00:00
Carl Eugen Hoyos
63bfcb6997
Fill range_map* in VC1Context.
...
Originally committed as revision 16515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 09:55:55 +00:00
Carl Eugen Hoyos
49186206eb
Add refdist_flag to VC1Context.
...
Originally committed as revision 16504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-09 16:51:21 +00:00
Kostya Shishkov
55374d57e8
421l: postproc flag may be present in any VC-1 AP frame type
...
Originally committed as revision 15842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 06:47:44 +00:00
Kostya Shishkov
77298e99b7
Make it possible to disable loop filter in VC-1.
...
Unlike H.264 it does not affect picture quality on any files I've watched.
Originally committed as revision 15295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 06:35:37 +00:00
Diego Biurrun
218e061201
Remove unused variable.
...
Originally committed as revision 14442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 21:56:26 +00:00
Kostya Shishkov
00a750009f
In-loop deblocking filter for VC-1 decoder
...
Originally committed as revision 14344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 06:21:27 +00:00
Erik Hovland
8d8d2b7391
Fix a mem leak in vc1_decode_frame().
...
Patch by Erik Hovland erik hovland org
Originally committed as revision 14277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 07:15:50 +00:00
Stefan Gehrer
5a89396989
remove duplicate tables
...
Originally committed as revision 13959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 11:33:49 +00:00
Stefano Sabatini
fe4bf37455
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
...
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Diego Biurrun
f4433de9ef
consistency cosmetics: indices --> indexes
...
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
Stefano Sabatini
162d4fc99d
Add long names to AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
Zuxy Meng
98a6fff98c
Apply 'cold' attribute to init/uninit functions in libavcodec
...
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Aurelien Jacobs
9701840bb5
add FF_ prefix to all (frame)_TYPE usage
...
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:31:02 +00:00
Diego Biurrun
5e53486545
typo fix: inited --> initialized
...
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
Aurelien Jacobs
60b6dbe716
const
...
Originally committed as revision 11800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 23:25:27 +00:00
Michael Niedermayer
14ff144c1b
some const
...
Originally committed as revision 11784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 16:04:29 +00:00
Zdenek Kabelac
e2fdba650d
Correctly clean up IntraX8Context upon codec close.
...
patch by Zdenek Kabelac, zdenek d kabelac a gmail d com
Originally committed as revision 11608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-25 07:37:46 +00:00
Kostya Shishkov
95e3fdb846
pqindex=0 is forbidden
...
Originally committed as revision 11540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-16 17:07:34 +00:00
Christophe Gisquet
750e37eb83
Select scan tables for 8x4 and 4x8 blocks only once.
...
Patch by Christophe GISQUET ([christophe][gisquet] <whirlpool sign> free <spot> fr)
Thread [PATCH] Determine once and for all zz scan tables to use in VC-1 VLD
Originally committed as revision 11525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-14 06:10:02 +00:00
Kostya Shishkov
b44665c4e6
Make decode210() common function.
...
Originally committed as revision 11382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 09:16:56 +00:00
Kostya Shishkov
3a18218e7b
Enable 4x4 IDCT for FASTTX=0 mode in WMV3
...
Originally committed as revision 11199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-09 05:55:45 +00:00
Aurelien Jacobs
59e6f60a99
add ff_ prefix to all simple_idct symbols
...
Originally committed as revision 11192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-08 21:21:11 +00:00
Kostya Shishkov
8df7cfe97c
Use IDCT functions when FASTTX=0
...
Originally committed as revision 11189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-08 10:50:50 +00:00
Kostya Shishkov
d2e45f33a4
Switch VC-1 decoder to output decoded residual immediately.
...
Originally committed as revision 11188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-08 10:41:18 +00:00
Vitor Sessak
f87d2632b3
Fix alignment broke by my last patch
...
Originally committed as revision 11123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:35:38 +00:00
Vitor Sessak
52b541ad79
spelling
...
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:21:04 +00:00
Christophe Gisquet
1a625dce18
Use put_signed_pixels_clamped where appropriate
...
Patch by Christophe GISQUET christophe.gisquet <whirlpool sign> fr(run of two 'e').(copy 2 bytes with offset -5)
Thread: [PATCH] Use signed version when putting and clamping pixels in VC-1
Originally committed as revision 11029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-15 06:25:20 +00:00
Kostya Shishkov
63d2bad846
X8 is supported now, so warning is incorrect
...
Originally committed as revision 10990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 08:23:01 +00:00
Michael Niedermayer
732cb5fd5a
add {} to make the else look a little more normal
...
Originally committed as revision 10978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:52:29 +00:00
Michael Niedermayer
dd2111bdb7
indention
...
Originally committed as revision 10977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:51:50 +00:00
Michael Niedermayer
8590bcc3cd
indention
...
Originally committed as revision 10976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:49:41 +00:00
Michael Niedermayer
9abc7e0fdc
intrax8 decoder patch by "someone"
...
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:37:48 +00:00
Kostya Shishkov
bf672ac73f
Use simple IDCT for now
...
Originally committed as revision 10835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 10:23:38 +00:00
Kostya Shishkov
c6137a61f4
Remove incorrect and unneeded code
...
Originally committed as revision 10834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 10:22:36 +00:00
Kostya Shishkov
bbfc038f09
WMV3 mode with FASTTX=0 seems to use standard IDCT instead of own 8x8 transform
...
Originally committed as revision 10782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 16:10:36 +00:00
Kostya Shishkov
2a898132a2
Enable error resilience in WMV3/VC-1 decoder
...
Originally committed as revision 10502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-15 11:06:27 +00:00
Kostya Shishkov
a9d78ac51a
HALFPQ should be used only for when PQUANT is selected
...
Originally committed as revision 10500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-15 09:24:53 +00:00
Kostya Shishkov
f7d2a43707
In case when any quantizer may occur, HALFPQ should be zero
...
Originally committed as revision 10499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-15 09:23:58 +00:00
Aurelien Jacobs
28296f9c9e
move get_unary() to its own file
...
Originally committed as revision 10240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-26 22:33:48 +00:00
Alex Beregszaszi
3a5729eae1
use skip_bits where appropriate
...
Originally committed as revision 10005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 01:08:28 +00:00
Alex Beregszaszi
5fc32c275e
use get_bits1(..) instead get_bits(.., 1)
...
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:13:31 +00:00
Alex Beregszaszi
3c2ddb5920
use get_unary from bitstream.h
...
Originally committed as revision 9996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 22:54:47 +00:00
İsmail Dönmez
63e24954be
Replace non-existing @fixme doxygen tags with @todo.
...
patch by Ismail Dönmez, ismail pardus.org tr
Originally committed as revision 9625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-13 13:04:55 +00:00
Kostya Shishkov
3662aa766f
Drop redundant assignment and variable
...
Originally committed as revision 9502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 14:11:29 +00:00
Diego Biurrun
e5a389a1b7
license header consistency cosmetics
...
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Kostya Shishkov
26bdc6bc6e
this prediction direction adjustment is wrong
...
Originally committed as revision 9450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-28 15:53:36 +00:00
Kostya Shishkov
c294d7c6ba
Typo
...
Originally committed as revision 9290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 15:03:28 +00:00
Diego Biurrun
755bfeabcc
misc spelling fixes
...
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Aurelien Jacobs
82dc348bd1
those tables don't need to be extern
...
Originally committed as revision 8972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:14:58 +00:00
Aurelien Jacobs
5ecb0677a2
use header instead of copying table declarations
...
Originally committed as revision 8970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:12:02 +00:00
Diego Biurrun
2029f312e8
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
...
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
Kostya Shishkov
a5c14fcaef
Add ff_ prefix to (externally) visible variables
...
Originally committed as revision 8951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 16:59:46 +00:00
Kostya Shishkov
2a2072fe1e
Use correct dequantizer value
...
Originally committed as revision 8950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 11:30:30 +00:00
Kostya Shishkov
660e83f815
Add prefix to some variables for consistency
...
Originally committed as revision 8916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 11:40:42 +00:00
Kostya Shishkov
22c3029da1
Move variables to vc1data.h
...
Originally committed as revision 8913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 10:58:32 +00:00
Kostya Shishkov
7d9a6a0fc3
Move some declarations into header
...
Based on patch by Denis Fortin
(cons (car '(fortin NOSPAM)) '(nerim net))
Originally committed as revision 8884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 03:34:21 +00:00
Diego Biurrun
5982ae94ee
Move VC1 parser to its own file.
...
Originally committed as revision 8882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 00:09:33 +00:00
Diego Biurrun
7f3f0dc221
Remove unused variable.
...
Originally committed as revision 8769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 15:55:45 +00:00
Kostya Shishkov
a61456152d
Pullback should be performed on scaled motion vectors in B-frames
...
Originally committed as revision 8750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 17:36:52 +00:00
Kostya Shishkov
44942d52b6
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
...
Originally committed as revision 8702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 05:31:22 +00:00
Kostya Shishkov
047549d382
vc1_split should be static
...
Originally committed as revision 8626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-04 13:26:26 +00:00
Kostya Shishkov
351f6b4e91
FASTTX==0 means additional 16 bits in extradata
...
Originally committed as revision 8533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-27 07:28:52 +00:00
Kostya Shishkov
6b27f3b87f
One more FASTTX-related hack
...
Originally committed as revision 8532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-27 07:27:53 +00:00
Kostya Shishkov
b666151045
1000l to myself - get correct quantization for blocks 1 and 2
...
P.S. This condition could be also written as if(n==3 || n==(2-dc_pred_dir))
Originally committed as revision 8508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 06:00:06 +00:00
Kostya Shishkov
9a44385e1a
Zero MV vectors for P frame intra blocks
...
Originally committed as revision 8440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 18:07:27 +00:00
Kostya Shishkov
7c9712335b
indentation
...
Originally committed as revision 8437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 07:53:16 +00:00
Kostya Shishkov
ab47579565
Proper handling of motion vectors for adv. profile
...
Originally committed as revision 8436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 07:51:40 +00:00
Kostya Shishkov
c52ff68852
Looks like I'll work on it this year too
...
Originally committed as revision 8160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 06:59:39 +00:00
Kostya Shishkov
9d1f80f207
WMV3 Complex Profile initial support
...
Originally committed as revision 8159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 06:39:58 +00:00
Reimar Döffinger
f66e4f5f9e
Add av_ prefix to clip functions
...
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 10:27:12 +00:00
Kostya Shishkov
674678b04a
Intensity compensation for B-frames in AP was missing
...
Originally committed as revision 7962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 07:48:23 +00:00
Kostya Shishkov
ac91185fb7
Progressive frames disguised as interlaced are supported
...
Originally committed as revision 7849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 07:16:52 +00:00
Kostya Shishkov
6eda6e37a9
B-frames could not be determined from broken_link/closed_entry, use fixed value
...
Originally committed as revision 7848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 07:11:20 +00:00
Kostya Shishkov
02c823d4f3
Wrong flag tested
...
Originally committed as revision 7847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 07:07:29 +00:00
Kostya Shishkov
4305a4ef0d
Set codec dimensions in extradata parsing
...
Originally committed as revision 7820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 06:58:02 +00:00
Kostya Shishkov
93731ff27d
Save frame header info in context variables
...
Originally committed as revision 7815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-04 10:46:28 +00:00
Kostya Shishkov
f0c31621c6
Set frame rate from extradata
...
Originally committed as revision 7814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-04 10:45:01 +00:00
Kostya Shishkov
f0a85d5f5c
These messages are just for debug purposes
...
Originally committed as revision 7811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-03 06:43:06 +00:00
Kostya Shishkov
e7cf38e556
Set codec dimensions if provided by extradata
...
Originally committed as revision 7810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-03 06:41:14 +00:00
Kostya Shishkov
35bffd7f3d
VC-1 parser
...
Originally committed as revision 7809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-03 06:39:50 +00:00
Kostya Shishkov
8165ee9394
0x00000103 is not an escape marker
...
Originally committed as revision 7807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-02 15:14:13 +00:00
Kostya Shishkov
77ccd3ba54
General approach to parsing chunks in VC-1 AP
...
Originally committed as revision 7803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-02 06:45:21 +00:00
Kostya Shishkov
b956373b6f
Check for out-of-bounds access
...
Originally committed as revision 7797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-01 18:39:49 +00:00
Kostya Shishkov
b024824bed
Fix BI-frames decoding for Adv. profile
...
Originally committed as revision 7758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 14:23:00 +00:00
Kostya Shishkov
74fd63d009
Set aspect ratio if present (for AP only)
...
Originally committed as revision 7720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-27 06:57:11 +00:00
Kostya Shishkov
8ea780d73d
Add debug messages for AP headers
...
Originally committed as revision 7695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 17:50:28 +00:00
Kostya Shishkov
14f3f3a1ad
Off-by-one error fix
...
Originally committed as revision 7694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 17:49:26 +00:00
Kostya Shishkov
5cca6bc3cd
Fail on VC-1 interlaced streams
...
Originally committed as revision 7693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 17:47:42 +00:00