~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/intrax8.c

  • Committer: Gauvain Pocentek
  • Date: 2012-03-06 11:59:12 UTC
  • mfrom: (66.1.15 precise)
  • Revision ID: gauvain@pocentek.net-20120306115912-h9d6kt9j0l532oo5
* 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:
304
304
    int quant;
305
305
 
306
306
    s->dsp.x8_setup_spatial_compensation(s->dest[chroma], s->edge_emu_buffer,
307
 
                                          s->current_picture.linesize[chroma>0],
 
307
                                          s->current_picture.f.linesize[chroma>0],
308
308
                                          &range, &sum, w->edges);
309
309
    if(chroma){
310
310
        w->orient=w->chroma_orient;
613
613
            dc_level+= (w->predicted_dc*divide_quant + (1<<12) )>>13;
614
614
 
615
615
            dsp_x8_put_solidcolor( av_clip_uint8((dc_level*dc_quant+4)>>3),
616
 
                                   s->dest[chroma], s->current_picture.linesize[!!chroma]);
 
616
                                   s->dest[chroma], s->current_picture.f.linesize[!!chroma]);
617
617
 
618
618
            goto block_placed;
619
619
        }
637
637
    }
638
638
 
639
639
    if(w->flat_dc){
640
 
        dsp_x8_put_solidcolor(w->predicted_dc, s->dest[chroma], s->current_picture.linesize[!!chroma]);
 
640
        dsp_x8_put_solidcolor(w->predicted_dc, s->dest[chroma], s->current_picture.f.linesize[!!chroma]);
641
641
    }else{
642
642
        s->dsp.x8_spatial_compensation[w->orient]( s->edge_emu_buffer,
643
643
                                            s->dest[chroma],
644
 
                                            s->current_picture.linesize[!!chroma] );
 
644
                                            s->current_picture.f.linesize[!!chroma] );
645
645
    }
646
646
    if(!zeros_only)
647
647
        s->dsp.idct_add ( s->dest[chroma],
648
 
                          s->current_picture.linesize[!!chroma],
 
648
                          s->current_picture.f.linesize[!!chroma],
649
649
                          s->block[0] );
650
650
 
651
651
block_placed:
656
656
 
657
657
    if(s->loop_filter){
658
658
        uint8_t* ptr = s->dest[chroma];
659
 
        int linesize = s->current_picture.linesize[!!chroma];
 
659
        int linesize = s->current_picture.f.linesize[!!chroma];
660
660
 
661
661
        if(!( (w->edges&2) || ( zeros_only && (w->orient|4)==4 ) )){
662
662
            s->dsp.x8_h_loop_filter(ptr, linesize, w->quant);
671
671
static void x8_init_block_index(MpegEncContext *s){ //FIXME maybe merge with ff_*
672
672
//not s->linesize as this would be wrong for field pics
673
673
//not that IntraX8 has interlacing support ;)
674
 
    const int linesize  = s->current_picture.linesize[0];
675
 
    const int uvlinesize= s->current_picture.linesize[1];
 
674
    const int linesize   = s->current_picture.f.linesize[0];
 
675
    const int uvlinesize = s->current_picture.f.linesize[1];
676
676
 
677
 
    s->dest[0] = s->current_picture.data[0];
678
 
    s->dest[1] = s->current_picture.data[1];
679
 
    s->dest[2] = s->current_picture.data[2];
 
677
    s->dest[0] = s->current_picture.f.data[0];
 
678
    s->dest[1] = s->current_picture.f.data[1];
 
679
    s->dest[2] = s->current_picture.f.data[2];
680
680
 
681
681
    s->dest[0] +=   s->mb_y        *   linesize << 3;
682
682
    s->dest[1] += ( s->mb_y&(~1) ) * uvlinesize << 2;//chroma blocks are on add rows
771
771
                /*emulate MB info in the relevant tables*/
772
772
                s->mbskip_table [mb_xy]=0;
773
773
                s->mbintra_table[mb_xy]=1;
774
 
                s->current_picture.qscale_table[mb_xy]=w->quant;
 
774
                s->current_picture.f.qscale_table[mb_xy] = w->quant;
775
775
                mb_xy++;
776
776
            }
777
777
            s->dest[0]+= 8;
784
784
error:
785
785
    ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
786
786
                        (s->mb_x>>1)-1, (s->mb_y>>1)-1,
787
 
                        (AC_END|DC_END|MV_END) );
 
787
                        ER_MB_END );
788
788
    return 0;
789
789
}