diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-01-24 23:47:33 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-01-24 23:47:33 +0000 |
| commit | 65a24d0b393a8c871ba4cab64da65659165e4dcd (patch) | |
| tree | 83ce010b5329947febb23d2bc9dab6efb998d36c /libavcodec/h263.c | |
| parent | 7a62e94a269d9b8993f5987d1a0895bc348c52a8 (diff) | |
optimization & bugfix extracted from the 4k line diff between ffmpeg 0.4.7 and http://www.alicestreet.com/ffh263.html
the other parts of the diff where
1. spelling fixes (rejected as only a small part of it could be applied automatically)
2. cosmetics (reindention, function reordering, var renaming, ...) with bugs (rejected)
3. rtp related stuff (rejetced as it breaks several codecs)
4. some changes to the intra/inter decission & scene change detection (quality tests needed first)
Originally committed as revision 2721 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 374c2d3cff..1a07b528bb 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1130,6 +1130,8 @@ void h263_encode_mb(MpegEncContext * s, s->misc_bits++; s->last_bits++; } + s->skip_count++; + return; } put_bits(&s->pb, 1, 0); /* mb coded */ @@ -2032,7 +2034,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n) if (level == 128) //FIXME check rv10 put_bits(&s->pb, 8, 0xff); else - put_bits(&s->pb, 8, level & 0xff); + put_bits(&s->pb, 8, level); i = 1; } else { i = 0; @@ -2102,7 +2104,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n) assert(slevel != 0); - if(slevel < 128 && slevel > -128) + if(level < 128) put_bits(&s->pb, 8, slevel & 0xff); else{ put_bits(&s->pb, 8, 128); @@ -2110,8 +2112,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n) put_bits(&s->pb, 6, (slevel>>5)&0x3f); } }else{ - if(slevel < 64 && slevel > -64) { - /* 7-bit level */ + if(level < 64) { // 7-bit level put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, last); put_bits(&s->pb, 6, run); |