aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cabac.h
Commit message (Collapse)AuthorAgeFilesLines
* h264: ff_init_cabac_states doesnt use its argument thus remove itMichael Niedermayer2012-08-261-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: use one table instead of several for cabac functionsRoland Scheidegger2012-04-281-0/+5
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-141-132/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: split cabac.h into declarations and function definitionsDiego Biurrun2012-01-121-130/+1
| | | | | | | | | | | | | | | | | | | | | | 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.
| * cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.Diego Biurrun2012-01-121-1/+0
| |
| * cabac: Remove ff_h264_lps_state array.Diego Biurrun2012-01-121-1/+0
| | | | | | | | It was only ever used in the cabac test program, but never initialized.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-081-25/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: Move code only used within the CABAC test program into the test program.Diego Biurrun2012-01-071-25/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-071-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: remove unused function renorm_cabac_decoderDiego Biurrun2012-01-061-9/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-051-61/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: drop unused and disabled get_cabac_u() / get_cabac_ueg() functionsDiego Biurrun2012-01-041-58/+0
| |
| * cabac: drop unused STRICT_LIMITS code branchDiego Biurrun2012-01-041-3/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-172/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: Move code only used in the cabac test program to cabac.c.Diego Biurrun2011-07-171-172/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-211-335/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cabac: move x86 asm to libavcodec/x86/cabac.hMans Rullgard2011-06-201-132/+24
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()Mans Rullgard2011-06-201-1/+1
| | | | | | | | | | | | Nothing requires this value in %eax. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: remove hardcoded esi in get_cabac_inline()Mans Rullgard2011-06-201-8/+8
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: remove hardcoded edx in get_cabac_inline()Mans Rullgard2011-06-201-8/+8
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: remove unused macro parameterMans Rullgard2011-06-201-3/+3
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: remove hardcoded ebx in inline asmMans Rullgard2011-06-201-26/+27
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: remove hardcoded struct offsets from inline asmMans Rullgard2011-06-201-26/+21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cabac: remove inline asm under #if 0Mans Rullgard2011-06-201-31/+0
| | | | | | | | | | | | A comment says it's not faster than the C code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cabac: remove BRANCHLESS_CABAC_DECODER switchMans Rullgard2011-06-201-105/+1
| | | | | | | | | | | | The code does not compile without this set. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLEDMans Rullgard2011-06-201-62/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Replace #ifdef PIC checks with the more appropriate ↵Reimar Döffinger2009-08-211-1/+1
| | | | | | HAVE_EBX_AVAILABLE/HAVE_7REGS. Originally committed as revision 19676 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split bitstream.h, put the bitstream writer stuff in the new fileStefano Sabatini2009-04-121-1/+1
| | | | | | put_bits.h. Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-131-7/+7
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Convert asm keyword into __asm__.Diego Pettenò2008-10-161-9/+9
| | | | | | | | | | | | | 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
* Remove useless #ifdef around #include.Diego Biurrun2008-09-141-2/+0
| | | | Originally committed as revision 15329 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Silence a couple of 'defined but not used' warnings by adding an av_unusedDiego Biurrun2008-09-021-4/+4
| | | | | | attribute to the relevant function declarations. Originally committed as revision 15161 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | 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
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-1/+1
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.Jeff Downs2008-04-161-110/+0
| | | | | | | | | | | 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
* Revert 12838 to redo it the right way (use svn copy to create newJeff Downs2008-04-161-0/+110
| | | | | | file based on old). Originally committed as revision 12845 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move decode_significance_x86() and decode_significance_8x8_x86() toJeff Downs2008-04-151-110/+0
| | | | | | | | | | 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
* cosmetics: remove useless \-newline escapesMåns Rullgård2008-03-171-6/+6
| | | | Originally committed as revision 12479 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use cltd instead of cdq asm mnemonic, ICC and gcc support both, butReimar Döffinger2008-02-281-3/+3
| | | | | | SunStudio 12 only supports the former. Originally committed as revision 12275 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Put some disabled functions that are only used in the test program in cabac.cDiego Biurrun2008-01-231-2/+2
| | | | | | under TEST as preprocessor conditional, same as the test program. Originally committed as revision 11601 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing const to last argument of decode_significance_8x8_x86.Reimar Döffinger2007-12-021-1/+1
| | | | | | Fixes "h264.c:5470: warning: passing argument 4 of 'decode_significance_8x8_x86' discards qualifiers from pointer target type" Originally committed as revision 11135 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: refill2() is not unused, it is used conditionally.Diego Biurrun2007-10-121-1/+1
| | | | | | | Fix the preprocessor directives to enable refill2() only when the conditions under which it is used apply. Originally committed as revision 10715 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Disable unused code; fixes several gcc warnings:Diego Biurrun2007-10-121-0/+6
| | | | | | | | | | | | cabac.h:112: warning: ‘put_cabac_static’ defined but not used cabac.h:158: warning: ‘put_cabac_terminate’ defined but not used cabac.h:186: warning: ‘put_cabac_u’ defined but not used cabac.h:221: warning: ‘put_cabac_ueg’ defined but not used cabac.h:273: warning: ‘refill2’ defined but not used cabac.h:811: warning: ‘get_cabac_u’ defined but not used cabac.h:827: warning: ‘get_cabac_ueg’ defined but not used Originally committed as revision 10713 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l: Revert accidental commit, restore previous version.Diego Biurrun2007-10-021-5/+0
| | | | Originally committed as revision 10644 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace CONFIG_VORBIS_DECODER #ifdef by if (ENABLE_VORBIS_DECODER).Diego Biurrun2007-10-021-0/+5
| | | | | | Blessed by Luca Barbato on IRC. Originally committed as revision 10642 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: typoDiego Biurrun2007-09-161-1/+1
| | | | Originally committed as revision 10507 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 09:03:04 +0000