← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/x86/h264_i386.h

  • Committer: Gauvain Pocentek
  • Date: 2012-03-06 11:59:12 UTC
  • mfrom: (66.1.15 precise)
  • Revision ID: gauvain@pocentek.net-20120306115912-h9d6kt9j0l532oo5
http://bugs.debian.org/442181
http://bugs.debian.org/481807
http://bugs.debian.org/496106
http://bugs.debian.org/533546
http://bugs.debian.org/568514
http://bugs.debian.org/637077
http://bugs.debian.org/638408
http://bugs.debian.org/643621
http://bugs.debian.org/650339
http://bugs.debian.org/653887
http://bugs.debian.org/654974
* Merge from Ubuntu:
  - put back faac support
  - recommends apport-hooks-medibuntu
  - change Maintainer, Uploaders & Vcs-* fields.
* New upstream snapshot
* upload to unstable
* Build against external libmpeg2
* drop 51_FTBFS_arm.patch again
* no longer build depend on libcdparanoia-dev on the Hurd
* Fix FTBFS on the hurd.
  Thanks to Samuel Thibault <sthibault@debian.org> (Closes: #654974)
* Fix FTBFS on arm
* New upstream snapshot, Closes: #650339, #643621, #481807
* Imported Upstream version 1.0~rc4+svn34492
* Bump standards version
* Bump dependency on libav >= 4:0.8~, Closes: #653887
* Fix build-indep
* Build mplayer-gui again, Closes: #568514
* Drop debian/all-lang-config-mak.sh, no longer needed
* include .dfsg1 in version number
* remove get-orig-source target
* no longer prune compiler flags from the environment
* No longer advertise nor build 3fdx, mga and dxr3 backends,
  Closes: #496106, #442181, #533546
* beautify mplayer version identification string
* Brown paperbag upload.
* Next try to fix build failure on sparce after recent binutils change.
* Brown paperbag upload.
* Really fix build failure on sparc after recent binutils change.
* Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid
  file overwrite errors.
* Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
* Fix build failure on sparc after recent binutils change.
* Urgency medium bumped because of RC-level bugfix
  and speeding up x264 transition.
* Update to my @debian.org email.
* Upload to unstable
* Enable joystick support on Linux only, Closes: #638408
* Rebuild fixes toolchain issue on arm, Closes: #637077
* New upstream snapshot
* following the discussion started by Diego Biurrun <diego@biurrun.de>
  in debian-devel, I have prepared a new packaging of 'mplayer'
  (with code that comes from CVS)
* the upstream tar.bz cannot be distributed by Debian, since it contains
   CSS code; so I am repackaging it 
* I have tried my best to address all known issues:
  - the package contains the detailed Copyright made by Diego Biurrun 
  - the package does not contain CSS code, or  AFAIK other code on which 
     there is active patent enforcement
  - there is a script  debian/cvs-changelog.sh  that shows all changes
     done to files included in this source.
    This should comply with GPLv2 sec 2.a  (in spirit if not in letter)
    For this reason, the source code contains CVS directories.
* needs   make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile

* some corrections, as suggested Diego Biurrun
  - binary codecs should go into /usr/lib/codecs (upstream default)
  - better template 'mplayer/install_codecs'
  - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected
* correction in 'mplayer/cfgnote'
* better mplayer.postinst and mplayer.config

* New upstream release
* better debian/copyright file
* do not ship a skin
* New upstream release
* changed DEB_BUILD_OPTIONS to DEB_BUILD_CONFIGURE ,
  DEB_BUILD_OPTIONS is used as in debian policy
* use gcc-3.4
* changed xlibs-dev to a long list of dependencies, for Debian/etch
* try to adhere to  http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
  (see README.Debian for details)
* removed dependency on xlibmesa-dev, disabled opengl
* New upstream release
* Simon McVittie <hacks@pseudorandom.co.uk> wonderful work:
- Work around Debian bug #267442 (glibc's sys/uio.h and gcc's altivec.h have
  conflicting uses for __vector) by re-ordering #includes
- Fix potential symlink attack in ./configure
- Disable support for binary codecs on platforms for which those codecs
  aren't available; also disable the corresponding Debconf note when it's
  inappropriate
- Changed Build-Depends: so it works in pbuilder
- Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev,
  libungif4-dev 
- Tweak debian/rules to avoid certain errors being ignored
- Use --language=all
* provide a target  'debian/rules get-orig-source' 
  that recreates the orig.tar.gz ; then use the above orig.tar.gz
* rewrote some parts of debian/rules
* don't clean and recompile docs if upstream ships them
* mplayer-doc was shipping too much stuff
* translated man pages where not installed properly
* compile with libdv4-dev
* correct README.Debian
* Forgot build-dep on libtheora
* Must not depend on libxvidcore
* New upstream release
* new release.
* rc1 to become 0.90
* new pre-release
* new pre-release
* gtk bug fixed.
* new release.
* version bumped
* 0.60 pre2 release
* 0.60 pre-release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/x86/h264_i386.h
36
36
 
37
37
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
38
38
//as that would make optimization work hard)
39
 
#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
 
39
#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
40
40
static int decode_significance_x86(CABACContext *c, int max_coeff,
41
41
                                   uint8_t *significant_coeff_ctx_base,
42
42
                                   int *index, x86_reg last_off){
45
45
    int minusindex= 4-(intptr_t)index;
46
46
    int bit;
47
47
    x86_reg coeff_count;
48
 
    int low;
49
 
    int range;
50
48
    __asm__ volatile(
51
 
        "movl %a11(%6), %5                      \n\t"
52
 
        "movl %a12(%6), %3                      \n\t"
53
 
 
54
49
        "2:                                     \n\t"
55
50
 
56
 
        BRANCHLESS_GET_CABAC("%4", "%6", "(%1)", "%3",
57
 
                             "%w3", "%5", "%k0", "%b0", "%a13")
 
51
        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3",
 
52
                             "%w3", "%5", "%k0", "%b0", "%6")
58
53
 
59
54
        "test $1, %4                            \n\t"
60
55
        " jz 3f                                 \n\t"
61
56
        "add  %10, %1                           \n\t"
62
57
 
63
 
        BRANCHLESS_GET_CABAC("%4", "%6", "(%1)", "%3",
64
 
                             "%w3", "%5", "%k0", "%b0", "%a13")
 
58
        BRANCHLESS_GET_CABAC("%4", "(%1)", "%3",
 
59
                             "%w3", "%5", "%k0", "%b0", "%6")
65
60
 
66
61
        "sub  %10, %1                           \n\t"
67
62
        "mov  %2, %0                            \n\t"
72
67
        "test $1, %4                            \n\t"
73
68
        " jnz 4f                                \n\t"
74
69
 
75
 
        "add  $4, %0                            \n\t"
76
 
        "mov  %0, %2                            \n\t"
 
70
        "add"OPSIZE"  $4, %2                    \n\t"
77
71
 
78
72
        "3:                                     \n\t"
79
73
        "add  $1, %1                            \n\t"
86
80
        "4:                                     \n\t"
87
81
        "add  %9, %k0                           \n\t"
88
82
        "shr $2, %k0                            \n\t"
89
 
 
90
 
        "movl %5, %a11(%6)                      \n\t"
91
 
        "movl %3, %a12(%6)                      \n\t"
92
83
        :"=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
93
 
         "=&r"(low), "=&r"(bit), "=&r"(range)
94
 
        :"r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
95
 
         "i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
96
 
         "i"(offsetof(CABACContext, bytestream))
 
84
         "+&r"(c->low), "=&r"(bit), "+&r"(c->range),
 
85
         "+m"(c->bytestream)
 
86
        :"m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off)
97
87
        : "%"REG_c, "memory"
98
88
    );
99
89
    return coeff_count;
101
91
 
102
92
static int decode_significance_8x8_x86(CABACContext *c,
103
93
                                       uint8_t *significant_coeff_ctx_base,
104
 
                                       int *index, x86_reg last_off, const uint8_t *sig_off){
 
94
                                       int *index, uint8_t *last_coeff_ctx_base, const uint8_t *sig_off){
105
95
    int minusindex= 4-(intptr_t)index;
106
96
    int bit;
107
97
    x86_reg coeff_count;
108
 
    int low;
109
 
    int range;
110
98
    x86_reg last=0;
111
99
    x86_reg state;
112
100
    __asm__ volatile(
113
 
        "movl %a12(%7), %5                      \n\t"
114
 
        "movl %a13(%7), %3                      \n\t"
115
 
 
116
101
        "mov %1, %6                             \n\t"
117
102
        "2:                                     \n\t"
118
103
 
120
105
        "movzbl (%0, %6), %k6                   \n\t"
121
106
        "add %9, %6                             \n\t"
122
107
 
123
 
        BRANCHLESS_GET_CABAC("%4", "%7", "(%6)", "%3",
124
 
                             "%w3", "%5", "%k0", "%b0", "%a14")
 
108
        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3",
 
109
                             "%w3", "%5", "%k0", "%b0", "%7")
125
110
 
126
111
        "mov %1, %k6                            \n\t"
127
112
        "test $1, %4                            \n\t"
128
113
        " jz 3f                                 \n\t"
129
114
 
130
115
        "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t"
131
 
        "add %9, %6                             \n\t"
132
116
        "add %11, %6                            \n\t"
133
117
 
134
 
        BRANCHLESS_GET_CABAC("%4", "%7", "(%6)", "%3",
135
 
                             "%w3", "%5", "%k0", "%b0", "%a14")
 
118
        BRANCHLESS_GET_CABAC("%4", "(%6)", "%3",
 
119
                             "%w3", "%5", "%k0", "%b0", "%7")
136
120
 
137
121
        "mov %2, %0                             \n\t"
138
122
        "mov %1, %k6                            \n\t"
141
125
        "test $1, %4                            \n\t"
142
126
        " jnz 4f                                \n\t"
143
127
 
144
 
        "add $4, %0                             \n\t"
145
 
        "mov %0, %2                             \n\t"
 
128
        "add"OPSIZE"  $4, %2                    \n\t"
146
129
 
147
130
        "3:                                     \n\t"
148
131
        "addl $1, %k6                           \n\t"
154
137
        "4:                                     \n\t"
155
138
        "addl %8, %k0                           \n\t"
156
139
        "shr $2, %k0                            \n\t"
157
 
 
158
 
        "movl %5, %a12(%7)                      \n\t"
159
 
        "movl %3, %a13(%7)                      \n\t"
160
 
        :"=&q"(coeff_count),"+m"(last), "+m"(index), "=&r"(low), "=&r"(bit),
161
 
         "=&r"(range), "=&r"(state)
162
 
        :"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_off),
163
 
         "i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
164
 
         "i"(offsetof(CABACContext, bytestream))
 
140
        :"=&q"(coeff_count),"+m"(last), "+m"(index), "+&r"(c->low), "=&r"(bit),
 
141
         "+&r"(c->range), "=&r"(state), "+m"(c->bytestream)
 
142
        :"m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_coeff_ctx_base)
165
143
        : "%"REG_c, "memory"
166
144
    );
167
145
    return coeff_count;
168
146
}
169
 
#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
 
147
#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
170
148
 
171
149
#endif /* AVCODEC_X86_H264_I386_H */