Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-03avcodec/cabac: Move encoder related stuff to libavcodec/tests/cabac.cAndreas Rheinhardt
(This is actually the second time the encoder stuff is removed; the first was in 8b4119187b62d6932e07aded11d33d3b24e1b42f.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2015-11-27avcodec/cabac: Check initial cabac decoder stateMichael Niedermayer
Fixes integer overflows Fixes: 1430e9c43fae47a24c179c7c54f94918/signal_sigsegv_421427_2340_591e9810c7b09efe501ad84638c9e9f8.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Found-by: xiedingbao (Ticket4727) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-10cabac: Make cabac starts hardcodedAnton Khirnov
There's not much reason to generate such a small table at runtime. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-10-10Revert "cabac: Allow hardcoding CABAC table."Derek Buitenhuis
This becomes unuseful in the following commit. This reverts commit 092d1977cc7146f20c8db2155e7d648afb300de7. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-09-06cabac: Allow hardcoding CABAC table.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-03-09Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'Michael Niedermayer
* commit 'dfe224f377be3e45758c69d881ca7874b82d647a': aarch64: get_cabac inline asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09aarch64: get_cabac inline asmJanne Grunau
Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets approximately 20% faster (no cycle counts available) compared to clang from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall speedup might be explained by additional inlining of get_cabac().
2014-01-15cabac: remove leftovers from the cabac encoderJanne Grunau
The cabac encoder was only used by the removed cabac test. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2013-03-13cabac: remove unused argument of ff_init_cabac_states()Michael Niedermayer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-08-26h264: ff_init_cabac_states doesnt use its argument thus remove itMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-28h264: use one table instead of several for cabac functionsRoland Scheidegger
The reason is this is easier for PIC code (in particular on darwin...). Keep the old names as pointers (static in cabac_functions.h so gcc knows these are just immediate offsets) so the c code can nicely stay the same (alternatively could use offsets directly in the functions needing the tables). This should produce the same code as before with non-pic and better code (confirmed) with pic. The assembly uses the new table but still won't work for PIC case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: add tests for targa ARM: fix Thumb-mode simple_idct_arm ARM: 4-byte align start of all asm functions rgb2rgb: rgb12to15() swscale-test: fix stack overread. swscale: fix invalid conversions and memory problems. cabac: split cabac.h into declarations and function definitions cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c. cabac: Remove ff_h264_lps_state array. Conflicts: libswscale/rgb2rgb.h libswscale/swscale_unscaled.c tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-13cabac: split cabac.h into declarations and function definitionsDiego Biurrun
This fixes standalone compilation of some decoders with --disable-optimizations. cabac.h defines some inline functions that use symbols from cabac.c. Without optimizations these inline functions are not eliminated and linking fails with references to non-existing symbols. Splitting the inline functions off into their own header and only #including it in the places where the inline functions are used allows #including cabac.h from anywhere without ill effects.
2012-01-13cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.Diego Biurrun
2012-01-13cabac: Remove ff_h264_lps_state array.Diego Biurrun
It was only ever used in the cabac test program, but never initialized.
2012-01-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (29 commits) cabac: Move code only used within the CABAC test program into the test program. vp56: Drop unnecessary cabac.h #include. h264-test: Initialize AVCodecContext.av_class. build: Skip compiling network.h and rtsp.h if networking is not enabled. cosmetics: drop some pointless parentheses Disable annoying warning without changing behavior faq: Solutions for common problems with sample paths when running FATE. avcodec: attempt to clarify the CODEC_CAP_DELAY documentation avcodec: fix avcodec_encode_audio() documentation. FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside. vqf: recognize more metadata chunks FATE test: BMV demuxer and associated video and audio decoders. FATE: indeo4 video decoder test. FATE: update xxan-wc4 test to a sample with more code coverage. Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream. g722enc: validate AVCodecContext.trellis g722enc: set frame_size, and also handle an odd number of input samples g722enc: split encoding into separate functions for trellis vs. no trellis mpegaudiodec: Use clearer pointer math tta: Fix returned error code at EOF ... Conflicts: libavcodec/h264.c libavcodec/indeo3.c libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/libxvidff.c libavcodec/mpegvideo.c libavcodec/ppc/mpegvideo_altivec.c libavcodec/tta.c libavcodec/utils.c libavfilter/vsrc_buffer.c libavformat/Makefile tests/fate/indeo.mak tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-08cabac: Move code only used within the CABAC test program into the test program.Diego Biurrun
2012-01-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: flicvideo: fix invalid reads vorbis: Avoid some out-of-bounds reads vqf: add more known extensions cabac: remove unused function renorm_cabac_decoder h264: Only use symbols from the SVQ3 decoder under proper conditionals. add bytestream2_tell() and bytestream2_seek() functions parsers: initialize MpegEncContext.slice_context_count to 1 spdifenc: use special alignment for DTS-HD length_code Conflicts: libavcodec/flicvideo.c libavcodec/h264.c libavcodec/mpeg4video_parser.c libavcodec/vorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06cabac: remove unused function renorm_cabac_decoderDiego Biurrun
2012-01-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-04cabac: drop unused and disabled get_cabac_u() / get_cabac_ueg() functionsDiego Biurrun
2012-01-04cabac: drop unused STRICT_LIMITS code branchDiego Biurrun
2011-07-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17cabac: Move code only used in the cabac test program to cabac.c.Diego Biurrun
2011-06-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21cabac: move x86 asm to libavcodec/x86/cabac.hMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()Mans Rullgard
Nothing requires this value in %eax. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: remove hardcoded esi in get_cabac_inline()Mans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: remove hardcoded edx in get_cabac_inline()Mans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: remove unused macro parameterMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: remove hardcoded ebx in inline asmMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21x86: cabac: remove hardcoded struct offsets from inline asmMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21cabac: remove inline asm under #if 0Mans Rullgard
A comment says it's not faster than the C code. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21cabac: remove BRANCHLESS_CABAC_DECODER switchMans Rullgard
The code does not compile without this set. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-21cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLEDMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
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
2009-08-21Replace #ifdef PIC checks with the more appropriate ↵Reimar Döffinger
HAVE_EBX_AVAILABLE/HAVE_7REGS. Originally committed as revision 19676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12Split bitstream.h, put the bitstream writer stuff in the new fileStefano Sabatini
put_bits.h. Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
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-01-14Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs
They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-16Convert asm keyword into __asm__.Diego Pettenò
Neither the asm() nor the __asm__() keyword is part of the C99 standard, but while GCC accepts the former in C89 syntax, it is not accepted in C99 unless GNU extensions are turned on (with -fasm). The latter form is accepted in any syntax as an extension (without requiring further command-line options). Sun Studio C99 compiler also does not accept asm() while accepting __asm__(), albeit reporting warnings that it's not valid C99 syntax. Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-15Remove useless #ifdef around #include.Diego Biurrun
Originally committed as revision 15329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03Silence a couple of 'defined but not used' warnings by adding an av_unusedDiego Biurrun
attribute to the relevant function declarations. Originally committed as revision 15161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31Globally rename the header inclusion guard names.Stefano Sabatini
Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09Use full path for #includes from another directory.Diego Biurrun
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.Jeff Downs
Move decode_significance_x86() and decode_significance_8x8_x86() to i386-specific file from cabac.h. New file is h264-oriented and only included from h264.c Resolves compilation when configured with --disable-optimizations due to decode_significance_8x8_x86 using last_coeff_flag_offset_8x8, which is only defined in h264.c Originally committed as revision 12846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16Revert 12838 to redo it the right way (use svn copy to create newJeff Downs
file based on old). Originally committed as revision 12845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15Move decode_significance_x86() and decode_significance_8x8_x86() toJeff Downs
i386-specific file from cabac.h. New file is h264-oriented and only included from h264.c Resolves compilation when configured with --disable-optimizations due to decode_significance_8x8_x86 using last_coeff_flag_offset_8x8, which is only defined in h264.c Originally committed as revision 12838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-18cosmetics: remove useless \-newline escapesMåns Rullgård
Originally committed as revision 12479 to svn://svn.ffmpeg.org/ffmpeg/trunk