generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,012 Commits 24 Branches 241 Tags 173 MiB
ba4aa656ce
Commit Graph

531 Commits

Author SHA1 Message Date
Stefano Sabatini
62d33dbc17 mpeg12: terminate mpeg2_video_profiles arrays 
Make av_get_profile_name() return NULL if no profile is detected.

Fix trac issue #130, fix crash reading file tek3.m2v.
(cherry picked from commit e5d80c7b2d)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-28 11:07:31 +02:00
Stefano Sabatini
e5d80c7b2d mpeg12: terminate mpeg2_video_profiles arrays 
Make av_get_profile_name() return NULL if no profile is detected.

Fix trac issue #130, fix crash reading file tek3.m2v.
 2011-04-28 01:45:19 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Anton Khirnov
e7021c0ed5 lavc: remove FF_API_HURRY_UP cruft 2011-04-26 08:16:05 +02:00
Michael Niedermayer
8772156be0 Merge remote branch 'qatar/master' 
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 03:54:30 +02:00
Ronald S. Bultje
94f7451a3a Introduce slice threads flag. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-21 19:42:19 -04:00
Reimar Döffinger
f82163cf1c Use consistent condition for whether to run slice-threading execute function. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-09 08:23:22 -04:00
Reimar Döffinger
da53f05fd0 Do not offer unsupported HWAccel PIX_FMT. 
Only fixes MPEG-1/MPEG-2 as a first step.
 2011-04-05 18:23:15 +02:00
Reimar Döffinger
735c4f0b84 Use CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete. 
CONFIG_VDPAU is the condition on which ff_vdpau_mpeg_picture_complete
is compiled in, so it is more appropriate, particularly since the
separate VDPAU decoder should be removed in the longer term.
 2011-04-05 18:23:10 +02:00
Michael Niedermayer
7f125c3e87 Move frame_pred_frame_dct check elsewhere. 
Fixes issue2405
 2011-04-03 16:40:13 +02:00
Michael Niedermayer
f35439699f Merge remote branch 'qatar/master' 
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 02:28:01 +02:00
Anton Khirnov
8ed2ae09a2 lavc: mark hurry_up for removal on next major bump 
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
 2011-04-02 16:17:24 +02:00
Carl Eugen Hoyos
ecf94986c8 Fix compilation with --disable-vdpau 2011-04-02 00:50:39 +02:00
Reimar Döffinger
9b7a0c5d88 Allow selecting VDPAU, XvMC via get_format for MPEG-2 
To avoid further special-casing, dummy AVHWAccels are added
for VDPAU.
It should be possible to move VDPAU completely to AVHWAccel later.
 2011-04-01 19:13:24 +02:00
Reimar Döffinger
e9ccdae09b Use consistent condition for whether to run slice-threading execute function. 2011-03-28 23:08:07 +02:00
Michael Niedermayer
797ef671dd Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  matroskadec: set default duration for simple block
  When building for MinGW32 disable strict ANSI compliancy.
  ARM: fix ff_apply_window_int16_neon() prototype
  configure: check for --as-needed support early
  ARM: NEON optimised apply_window_int16()
  ac3enc: NEON optimised shift functions
  ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
  mpeg12.c: fix slice threading for mpeg2 field picture mode.
  ffmetadec.c: fix compiler warnings.
  configure: Don't explicitly disable ffplay or in/outdevices on dos
  configure: Remove the explicit disabling of ffserver
  configure: Add fork as a dependency to ffserver

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-25 02:57:41 +01:00
Michael Niedermayer
628724b61d More advanced ffmpeg mpeg2 aspect guessing code. 
Fixes issue1613, 621, 562 simultaneously

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-25 01:45:47 +01:00
Ronald S. Bultje
f711424969 mpeg12.c: fix slice threading for mpeg2 field picture mode. 
Fixes "make THREADS=2 fate-mpeg2-field-enc".
 2011-03-24 12:16:22 -04:00
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01: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
Benjamin Larsson
aecd0a4496 Export profiles from the mpeg2 video decoder 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-10 18:05:35 -05:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Mans Rullgard
f162e988aa Remove redundant checks against MIN_CACHE_BITS 
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-23 16:41:04 +00:00
Vitor Sessak
6e16398aa3 Make dc_lum_vlc and dc_chroma_vlc non-static symbols, 
this fixed the decoding of version 3 PSX MDEC files.

Originally committed as revision 26230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:38:42 +00:00
Michael Niedermayer
a20df85886 Fix doxy that refers to the wrong variable. 
Originally committed as revision 24549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:54:26 +00:00
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +00:00
Daniel Kristjansson
0db2d3cf1d Do not skip one of three bits zero padding. 
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 23914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 21:46:03 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +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
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264. 
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 02:17:04 +00:00
Michael Niedermayer
53f66cee0c Add ff_ prefix for mpeg2_dc_scale_table. 
Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:49:46 +00:00
Michael Niedermayer
acbb378d1d Fix timestamp association for mpeg2 field pictures. 
Fixes /MPlayer/incoming/codec_copy_fails_vob_to_mpeg-ts/codec_copy_fails_vob_to_mpeg-ts.vob

Originally committed as revision 21949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 23:22:51 +00:00
Carl Eugen Hoyos
b52fcba9cd Fix decoding ATI VCR2 codec, sample in 
samples/V-codecs/ATI-VCR12/ATI/VCR2test.avi
Software decoding was broken since r8865, when two new context variables
were added, but not initialized in vcr2_init_sequence().
Another such context variable was added in r18381.

Originally committed as revision 21438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-24 22:47:50 +00:00
Michael Niedermayer
7a14430ed7 Be less picky on invalid frame_pred_frame_dct values. 
Fixed issue1615.

Originally committed as revision 20814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 19:44:01 +00:00
Carl Eugen Hoyos
6e4f40e1f4 Cosmetics: Reindent after r20679. 
Originally committed as revision 20738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 09:41:23 +00:00
Michael Niedermayer
483aad717e slif aka "SoftLab MPEG-2 I-frames Codec" support. 
Flipping one bit still is popular it seems as a means to create a new codec.
fixes issue1469.

Originally committed as revision 20679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 02:07:46 +00:00
Michael Niedermayer
52069c4d3c Move "slice below image" check from mpeg_decode_slice to its caller. 
Should fix issue1277.

Originally committed as revision 20676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 23:08:25 +00:00
Michael Niedermayer
d52b4abe8b Move dummy picture allocation code from mpeg1/2 to mpegvideo. 
This fixes a infinite loop on a b frame.

Originally committed as revision 20672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 21:22:01 +00:00
Michael Niedermayer
078cdecf9e Set mb_y in mpeg2 field pictures like h264 does. 
This fixes -vismv & -debug 16384 with field pictures.

Originally committed as revision 20670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 19:14:00 +00:00
Michael Niedermayer
ab8c48de8c Start decoding from seq/gop too, not just I frames. 
Possibly fixes issue1124.

Originally committed as revision 20667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 03:32:43 +00:00
Michael Niedermayer
f0ec239438 Fix dual prime motion compensation in field pictures. 
Fixes issue1125.

Originally committed as revision 20666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 02:37:03 +00:00
Michael Niedermayer
aeaef4ed63 Print errors instead of just ignoring contradictionary values in mpeg2 silently. 
Originally committed as revision 20656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 14:31:40 +00:00
Michael Niedermayer
87f6806069 Override a few values read so as to ensure that things are not inconsistent. 
Originally committed as revision 20654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 03:32:30 +00:00
Michael Niedermayer
d9b99556bf Restructure dummy frame allocation. 
New code also allocates a dummy frame for an p field after an i field,
previously that could segfault due to reading from NULL+x.

Originally committed as revision 20653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 03:05:11 +00:00
Michael Niedermayer
9d13016690 Make sure field_select is not set to nonsensical values even if unused. 
Fixed an assert failure.

Originally committed as revision 20646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 01:50:43 +00:00
Michael Niedermayer
1c3260939d Factorize "s->first_slice = 1" out. 
Originally committed as revision 20645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 23:17:46 +00:00
Michael Niedermayer
88eba670fb Also check the location of the picture start code and picture coding 
extension a little.

Originally committed as revision 20644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 23:05:06 +00:00
Michael Niedermayer
fc23d843e1 Check order of startcodes, ignore some obviously wrong ones. 
Fixes issue487.

Originally committed as revision 20643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 22:51:53 +00:00
Michael Niedermayer
bbf266fdb5 Move mpeg_decode_postinit() out of bitstream decoding functions, it does not 
belong in there.

Originally committed as revision 20642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 21:32:33 +00:00
Michael Niedermayer
1206f1d630 Inline mpeg_decode_extension, will simplify future changes. 
Originally committed as revision 20641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 18:57:12 +00:00
Michael Niedermayer
191ad11e91 Simplify mpeg_decode_user_data() 
Originally committed as revision 20640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 14:17:28 +00:00
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count(). 
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 17:42:43 +00:00
Reimar Döffinger
01418506a2 Remove casts that are useless since the argument is void *. 
Originally committed as revision 20177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 06:33:18 +00:00
Gwenole Beauchesne
25450bb252 Move down HWAccel code path so that to fill in s->mb_x first. 
Originally committed as revision 19875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 07:49:08 +00:00
Baptiste Coudurier
6be8b20466 Revert r19317, "simplify slice_end, return size of output frame". 
It returns non decodable B-frames.

Originally committed as revision 19324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:35:28 +00:00
Baptiste Coudurier
f7f1eb6cc9 simplify slice_end, return size of output frame 
Originally committed as revision 19317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 17:29:52 +00:00
Baptiste Coudurier
a4a750d3b2 Rename alloc_picture to ff_alloc_picture and move its definition 
in mpegvideo.h to avoid including mpegvideo_common.h in mpeg12.c,
because it contains motion code.

Originally committed as revision 18968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 19:55:35 +00:00
Wolfram Gloger
ed1dc74e18 Fix off by one offset with fetch_timestamps, pts_parser_problem.mpg. 
Patch by Wolfram Gloger, wmglo at dentm dot med dot uni-muenchen dot de.

Originally committed as revision 18959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 00:14:32 +00:00
Reimar Döffinger
936bb4a9bc Add a forward declaration of mpeg1_decode_block_intra to fix compilation 
broken by r18859 for e.g. all gcc 4 compilers.

Originally committed as revision 18861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 09:09:07 +00:00
Måns Rullgård
db2f209352 mpeg12: fix non-standard use of "extern inline" 
Rename ff_mpeg1_decode_block_intra to mpeg1_decode_block_intra and
make it static.  Add ff_mpeg1_decode_block_intra as plain extern
function calling mpeg1_decode_block_intra.

Originally committed as revision 18859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 00:54:29 +00:00
Baptiste Coudurier
9d9a623925 decode mpeg-2 closed gop first b frames, fix issue #824 
Originally committed as revision 18837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-15 05:39:44 +00:00
David Conrad
580a7465fb Add a chroma_sample_location field to define positioning of chroma samples 
Originally committed as revision 18795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-11 04:34:23 +00:00
Michael Niedermayer
9c24cd7236 Extract colorspace fields from MPEG1/2. 
Originally committed as revision 18747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 19:53:49 +00:00
Michael Niedermayer
714127812c Ignore first entry of intra matrixes if it is invalid. 
Fixes pink.mpg / issue1046.

Originally committed as revision 18724 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-01 12:31:19 +00:00
Michael Niedermayer
45ccc61a06 Factorize quantization matrix loading code out. 
Originally committed as revision 18723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-01 12:17:25 +00:00
Michael Niedermayer
0127b86108 Fix mb_height for interlaced mpeg2. 
This correctly fixes issue961, thanks to steven warren for spotting my mistake.

Originally committed as revision 18381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 20:48:44 +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
Michael Niedermayer
a4c7a5ea27 Call ff_fetch_timestamp() for mpeg1/2 when a picture start code is found instead 
of calling it at the end of a frame with a large negative offset.
This significantly reduces the maximal distance in container packets between
the point where the first byte of the "access unit" was stored and where
we call ff_fetch_timestamp() thus reducing the constraints on our parser.
Also change the parser from next_frame_offset to cur, this is needed
because now the reference is from container packet start instead of
frame start. (i previously misinterpreted this as bug)

Originally committed as revision 17731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 14:53:18 +00:00
Diego Biurrun
326b554ccf xvmc works with MPEG-2 as well as MPEG-1, note this in the codec long_name. 
Originally committed as revision 17717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:20:00 +00:00
Reimar Döffinger
d819b41ba1 Remove unused variable in mpeg_mc_decode_init 
Originally committed as revision 17676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 09:14:20 +00:00
Gwenole Beauchesne
6aca2c6785 Remove superfluous call to mpeg_decode_slice() for hwaccel, this 
function already contains the needed code.
Patch by Gwenole Beauchesne.

Originally committed as revision 17636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:20:45 +00:00
Michael Niedermayer
3797c74ba5 Add ticks_per_frame, this should hopefully fix the regressions caused 
by the time_base change.

Originally committed as revision 17630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 23:47:32 +00:00
Michael Niedermayer
765e94ef9e More AVhwaccel hunks from Gwenole Beauchesne. 
Originally committed as revision 17590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 19:16:27 +00:00
Ivan Schreter
edbd72acea Correct time_base and repeat_pict for MPEG2 video. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 20:23:19 +00:00
Michael Niedermayer
a05aa821b6 add ff_find_hwaccel() by Gwenole Beauchesne 
Originally committed as revision 17569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 19:04:43 +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
Ivan Kalvachev
21effaa4b2 Change the type of pblocks from pointers to short array into 
pointers to array of 64 DCTELEM, similarly to other block fields.
This also get rid of some casts and fixes a warning.

Originally committed as revision 17517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 09:02:06 +00:00
Ivan Kalvachev
4acfdcab26 Cosmetics 
Originally committed as revision 17294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 23:01:19 +00:00
Ivan Kalvachev
ce0e60a108 Merge preprocessor if CONFIG_MPEG_XVMC_DECODER and code if( &&) 
where possible

Originally committed as revision 17293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:59:19 +00:00
Ivan Kalvachev
9e494ab77c Check ff_xvmc_field_start() result in all cases. 
Originally committed as revision 17290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:46:20 +00:00
Diego Biurrun
4440bd0da4 Add xvmc_internal.h that contains all internal xvmc function declarations. 
This allows getting rid of a bunch of ugly forward declarations.

Originally committed as revision 17280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 20:37:14 +00:00
Ivan Kalvachev
78f9a87830 use ff_xvmc for function names instead of XVMC_ 
Originally committed as revision 17254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 18:25:41 +00:00
Diego Biurrun
fc2dd7e3de Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices. 
Originally committed as revision 17229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 15:37:40 +00:00
Peter Ross
44ba8b650f don't assume quant_matrix[0]==8 in ff_mpeg1_decode_block_intra(). this is required for the Electronic Arts TQI decoder. 
Originally committed as revision 17001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 07:59:11 +00:00
Peter Ross
50240e5646 convert mpeg1_decode_block_intra() to inline global 
Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 07:57:11 +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
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead 
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 12:21:01 +00:00
Carl Eugen Hoyos
2b3242253d Add mpeg1_vdpau decoder. 
Originally committed as revision 16640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 16:50:32 +00:00
Carl Eugen Hoyos
e7edb2ea93 12l: Fix compilation with --disable-vdpau. 
Originally committed as revision 16630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 02:50:20 +00:00
NVIDIA Corporation
d37edddc09 Add VDPAU hardware accelerated decoding for MPEG1 and MPEG2 which can 
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 02:14:07 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Michael Niedermayer
062e7c3ca8 Avoid using sub_id in mpeg1/2video. 
Originally committed as revision 16587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 21:13:45 +00:00
Carl Eugen Hoyos
448ecb68e3 Rename mpeg_set_pixelformat() as mpeg_get_pixelformat(). 
Originally committed as revision 16455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 18:58:18 +00:00
Carl Eugen Hoyos
93c69a94ea Factorise setting of avctx->pix_fmt. 
Originally committed as revision 16453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 15:16:33 +00:00
Diego Biurrun
b24298badc Switch xvmc over to a CONFIG_ option. 
Originally committed as revision 16153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-15 22:22:51 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Roman Shaposhnik
3a84713aaa Making it easier to send arbitrary structures as work orders to MT workers 
Originally committed as revision 15804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-12 17:47:23 +00:00
Michael Niedermayer
ed16f91f26 Guess picture type from picture coding extension when the main header is damaged. 
Originally committed as revision 15456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 23:19:12 +00:00
Michael Niedermayer
047599a4ba Rename error_resilience to error_recognition. 
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:18:49 +00:00
Michael Niedermayer
395206f6b1 Ignore the spec, and calculate aspect ratio on width/height. 
Fixes issue562 and issue621.

Originally committed as revision 15183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:04:46 +00:00
Baptiste Coudurier
8ee552f69c simplify mpeg12 avctx->pix_fmt set 
Originally committed as revision 14986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-26 23:25:29 +00:00
Diego Biurrun
071083b4a5 Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs. 
Now that it is exported, this should avoid confusion and name clashes.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-20 17:05:14 +00:00
Diego Biurrun
054480a57b cosmetics: comment spelling/grammar fixes 
Originally committed as revision 14866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-20 16:59:26 +00:00
Diego Biurrun
0da49fca79 Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately. 
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 20:52:26 +00:00
Diego Biurrun
6ec87fbd92 Mark init_vlcs function as av_cold. 
Originally committed as revision 14830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 08:55:40 +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
Baptiste Coudurier
ce8f4fb388 print correct mpeg-2 broken_link value, and print closed_gop 
Originally committed as revision 13630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 19:04:14 +00:00
Michael Niedermayer
2d80ce2bdf Change init_2d_vlc_rl() to not use *alloc_static(). 
Originally committed as revision 13566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 21:06:40 +00:00
Michael Niedermayer
9ef3193df1 Remove constant argument. 
Originally committed as revision 13564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 20:06:08 +00:00
Michael Niedermayer
f76605e880 Switch to INIT_VLC_USE_NEW_STATIC. 
Note, if code you maintain still uses INIT_VLC_USE_STATIC please change
it as well! Iam not volunteering to clean all codecs up ...

Originally committed as revision 13563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 20:02:59 +00:00
Michael Niedermayer
16e30b7a04 Do not reject odd width/height. 
Fixes issue371.

Originally committed as revision 13377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 13:31:07 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 22:28:43 +00:00
Stefano Sabatini
6140271f54 Add some long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 07:24:44 +00:00
Michael Niedermayer
9b7ca3b71d Decode stuff from extradata as well. 
Originally committed as revision 12675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-03 18:28:16 +00:00
Michael Niedermayer
7f8ef97534 Factorize code a little. 
Originally committed as revision 12674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-03 18:25:07 +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
Diego Biurrun
b2c26e2717 Use correct t printf modifier for pointer differences. 
Originally committed as revision 12442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 13:19:39 +00:00
Baptiste Coudurier
99c763d143 log aspect ratio forbidden value, and fail if error resilience is high 
Originally committed as revision 12438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 09:33:38 +00:00
Baptiste Coudurier
a2338352be do not fail badly if aspect ratio is 0/forbidden, fix issue 369 
Originally committed as revision 12434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 18:26:53 +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
Michael Niedermayer
21da962cf1 Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2 
field pictures much more digestable.

Originally committed as revision 12160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-20 19:45:38 +00:00
Michael Niedermayer
0521808158 Reduce the number of senselessly scanned bytes. 
Originally committed as revision 12144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-19 15:55:14 +00:00
Michael Niedermayer
e68c7a4abe const 
Originally committed as revision 11710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:34:43 +00:00
Michael Niedermayer
9bd005bdbc Drop non key frames before the first key frame. 
Originally committed as revision 11411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 01:14:09 +00:00
Stefan Lucke
b8a9dfb7f6 Prevent infinite loop when buffer holds SEQ_END_CODE only. Fix for r9870 
Patch by Stefan Lucke <stefan <at> lucke.in-berlin.de>
Subject: API breakage by r9870
Date: 2007-10-05 11:06:47 GMT
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/57467

Originally committed as revision 10720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-13 01:34:00 +00:00
Michael Niedermayer
4e2b9bcc08 Make MPEG-1/2 decoder work with the libmpeg2-style bitstream reader. 
Originally committed as revision 9890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-04 11:01:11 +00:00
Michael Niedermayer
392b748293 output last frame if seq end code is encountered 
fixes video decoding of AC3TEST.vob
closes issue19

Originally committed as revision 9870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-02 20:49:42 +00:00
Michael Niedermayer
037df60e05 simplify s->mv_dir init 
Originally committed as revision 9867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-02 01:28:37 +00:00
Michael Niedermayer
653f738780 exchange the values of MV_DIR_FORWARD and MV_DIR_BACKWARD (this is more sane, 
matches the order of some other stuff and allows some simplifications)

Originally committed as revision 9864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 22:12:52 +00:00
Michael Niedermayer
04b502fa36 exchange if() and for() in the MT_FIELD case 
18 cpu cycles faster for matrixbench

Originally committed as revision 9863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 21:17:26 +00:00
Michael Niedermayer
f4fbcd33d9 exchange for() and if() order in the MT_FRAME case 
safes 24 cpu cycles

Originally committed as revision 9862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 21:05:58 +00:00
Michael Niedermayer
356ab1dace change 
for(){
    if(){
        switch(){

to
switch(){
    for(){
        if(){

this halfs the number of times the switch is executed in bidir blocks, in
other blocks the number is the same
25 cpu cycles less with matrixbench on duron

Originally committed as revision 9860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 20:37:41 +00:00
Michael Niedermayer
2952d13ad5 merge another 2 if() to save a few cpu cycles 
Originally committed as revision 9858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 20:04:12 +00:00
Michael Niedermayer
09d1bee89e reorder if() so that the condition can be simplified 
saves another 4 cpu cycles

Originally committed as revision 9857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 19:37:28 +00:00
Michael Niedermayer
0ac6b5a301 merge/simplify 2 if() 
~4 cpu cylces faster for the matrixbench video

Originally committed as revision 9856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 19:26:24 +00:00
Michael Niedermayer
fecc146b28 merge 2 if() 
this safes 1-2 cpu cycles

Originally committed as revision 9855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-01 19:17:36 +00:00
Michael Niedermayer
01e795aba3 move some code which was executed for every skipped MB so it is only executed 
for the first skipped mb in a run

Originally committed as revision 9845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-31 21:39:09 +00:00
Michael Niedermayer
4152c5ce14 get rid of a useless variable 
Originally committed as revision 9844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-31 21:00:17 +00:00
Michael Niedermayer
7ceab4af35 avoid 2 additions (1 cpu cycle) per MB 
Originally committed as revision 9843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-31 20:52:49 +00:00
Michael Niedermayer
5bfbf0a54f chroma_qscale seems not used anywhere for mpeg1/2 so do not waste cpu time setting it 
Originally committed as revision 9842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-31 20:44:48 +00:00
Aurelien Jacobs
eaa7557c73 add proper ff_ prefix to new extern symbols 
Originally committed as revision 9479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 09:21:55 +00:00
Aurelien Jacobs
a6bc573158 split mpeg12 encoder out of mpeg12.c 
Originally committed as revision 9477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 09:08:28 +00:00
Michael Niedermayer
28bf121a22 get rid of one unneeded #ifdef HAVE_XVMC 
Originally committed as revision 9389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-22 17:18:58 +00:00
Diego Biurrun
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +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
ab8072a6a2 move imx_dump_header bitstream filter in its own file 
Originally committed as revision 9067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-19 00:44:41 +00:00
Jason Millard
cd61e40781 allow to enable or disable every bitstream filters individually 
Original patch by Jason Millard   jsm174 _at_ gmail
Date: On Fri, 11 May 2007 11:14:01 -0400
Subject: [FFmpeg-devel] enable/disable bitstream filters?

Originally committed as revision 9010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-12 23:33:53 +00:00