March 2006 - ffmpeg-cvslog - lists.ffmpeg.org

CVS: ffmpeg/libavformat tta.c, NONE, 1.1 Makefile, 1.121, 1.122 allformats.c, 1.57, 1.58 avformat.h, 1.141, 1.142
by alex＠mplayerhq.hu 30 Mar '07

30 Mar '07

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv22032 Modified Files: Makefile allformats.c avformat.h Added Files: tta.c Log Message: tta demuxer, also usable for moving tta audio data into an other container --- NEW FILE: tta.c --- /* * TTA demuxer * Copyright (c) 2006 Alex Beregszaszi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" #define ALT_BITSREAM_READER_LE #include "bitstream.h" typedef struct { int totalframes, currentframe; uint32_t *seektable; } TTAContext; static int tta_probe(AVProbeData *p) { const uint8_t *d = p->buf; if (p->buf_size < 4) return 0; if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') return 80; return 0; } static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) { TTAContext *c = s->priv_data; AVStream *st; int i, channels, bps, samplerate, datalen, framelen, start; start = url_ftell(&s->pb); if (get_le32(&s->pb) != ff_get_fourcc("TTA1")) return -1; // not tta file url_fskip(&s->pb, 2); // FIXME: flags channels = get_le16(&s->pb); bps = get_le16(&s->pb); samplerate = get_le32(&s->pb); datalen = get_le32(&s->pb); url_fskip(&s->pb, 4); // header crc framelen = 1.04489795918367346939 * samplerate; c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0); c->currentframe = 0; c->seektable = av_mallocz(sizeof(uint32_t)*c->totalframes); if (!c->seektable) return AVERROR_NOMEM; for (i = 0; i < c->totalframes; i++) c->seektable[i] = get_le32(&s->pb); url_fskip(&s->pb, 4); // seektable crc st = av_new_stream(s, 0); // av_set_pts_info(st, 32, 1, 1000); if (!st) return AVERROR_NOMEM; st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_TTA; st->codec->channels = channels; st->codec->sample_rate = samplerate; st->codec->bits_per_sample = bps; st->codec->extradata_size = url_ftell(&s->pb) - start; st->codec->extradata = av_mallocz(st->codec->extradata_size); url_fseek(&s->pb, start, SEEK_SET); // or SEEK_CUR and -size ? :) get_buffer(&s->pb, st->codec->extradata, st->codec->extradata_size); return 0; } static int tta_read_packet(AVFormatContext *s, AVPacket *pkt) { TTAContext *c = s->priv_data; int ret, size; // FIXME! if (c->currentframe > c->totalframes) size = 0; else size = c->seektable[c->currentframe]; c->currentframe++; if (av_new_packet(pkt, size) < 0) return AVERROR_IO; pkt->pos = url_ftell(&s->pb); pkt->stream_index = 0; ret = get_buffer(&s->pb, pkt->data, size); if (ret <= 0) { av_free_packet(pkt); return AVERROR_IO; } pkt->size = ret; // av_log(s, AV_LOG_INFO, "TTA packet #%d desired size: %d read size: %d at pos %d\n", // c->currentframe, size, ret, pkt->pos); return 0; //ret; } static int tta_read_close(AVFormatContext *s) { TTAContext *c = s->priv_data; if (c->seektable) av_free(c->seektable); return 0; } AVInputFormat tta_iformat = { "tta", "true-audio", sizeof(TTAContext), tta_probe, tta_read_header, tta_read_packet, tta_read_close, .extensions = "tta", }; int tta_init(void) { av_register_input_format(&tta_iformat); return 0; } Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- Makefile 11 Feb 2006 20:51:26 -0000 1.121 +++ Makefile 12 Feb 2006 02:18:37 -0000 1.122 @@ -23,7 +23,7 @@ nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \ ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \ - voc.o + voc.o tta.o # muxers ifeq ($(CONFIG_MUXERS),yes) Index: allformats.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- allformats.c 10 Feb 2006 01:24:32 -0000 1.57 +++ allformats.c 12 Feb 2006 02:18:37 -0000 1.58 @@ -116,6 +116,7 @@ nsvdec_init(); daud_init(); voc_init(); + tta_init(); #ifdef CONFIG_MUXERS /* image formats */ Index: avformat.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- avformat.h 10 Feb 2006 01:24:32 -0000 1.141 +++ avformat.h 12 Feb 2006 02:18:37 -0000 1.142 @@ -555,6 +555,9 @@ /* voc.c */ int voc_init(void); +/* tta.c */ +int tta_init(void); + /* adts.c */ int ff_adts_init(void);

2 1

CVS: ffmpeg/libavcodec Makefile, 1.243, 1.244 dsputil.h, 1.128, 1.129 fft.c, 1.10, 1.11
by corey＠mplayerhq.hu 14 May '06

14 May '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv22424/libavcodec Modified Files: Makefile dsputil.h fft.c Log Message: 3DNow! & Extended 3DNow! versions of FFT Patch by Zuxy Meng, zuxy <<dot>> meng >>at<< gmail <<dot>> com Minor non-functional diff-related fixes by me. Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- Makefile 17 Feb 2006 03:17:42 -0000 1.243 +++ Makefile 8 Mar 2006 04:13:55 -0000 1.244 @@ -330,7 +330,7 @@ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ i386/idct_mmx.o i386/motion_est_mmx.o \ i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ - i386/vp3dsp_sse2.o + i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o ifeq ($(CONFIG_GPL),yes) OBJS += i386/idct_mmx_xvid.o endif @@ -338,6 +338,10 @@ i386/fft_sse.o: CFLAGS+= -msse depend: CFLAGS+= -msse endif +ifdef TARGET_BUILTIN_3DNOW +i386/fft_3dn.o: CFLAGS+= -m3dnow +i386/fft_3dn2.o: CFLAGS+= -march=athlon +endif endif # armv4l specific stuff Index: dsputil.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- dsputil.h 10 Feb 2006 06:55:24 -0000 1.128 +++ dsputil.h 8 Mar 2006 04:13:55 -0000 1.129 @@ -564,6 +564,8 @@ void ff_fft_permute(FFTContext *s, FFTComplex *z); void ff_fft_calc_c(FFTContext *s, FFTComplex *z); void ff_fft_calc_sse(FFTContext *s, FFTComplex *z); +void ff_fft_calc_3dn(FFTContext *s, FFTComplex *z); +void ff_fft_calc_3dn2(FFTContext *s, FFTComplex *z); void ff_fft_calc_altivec(FFTContext *s, FFTComplex *z); static inline void ff_fft_calc(FFTContext *s, FFTComplex *z) Index: fft.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/fft.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- fft.c 12 Jan 2006 22:43:15 -0000 1.10 +++ fft.c 8 Mar 2006 04:13:55 -0000 1.11 @@ -57,12 +57,12 @@ s->exptab1 = NULL; /* compute constant table for HAVE_SSE version */ -#if (defined(HAVE_MMX) && defined(HAVE_BUILTIN_VECTOR)) || defined(HAVE_ALTIVEC) +#if (defined(HAVE_MMX) && (defined(HAVE_BUILTIN_VECTOR) || defined(HAVE_MM3DNOW))) || defined(HAVE_ALTIVEC) { int has_vectors = 0; #if defined(HAVE_MMX) - has_vectors = mm_support() & MM_SSE; + has_vectors = mm_support() & (MM_3DNOW | MM_3DNOWEXT | MM_SSE | MM_SSE2); #endif #if defined(HAVE_ALTIVEC) && !defined(ALTIVEC_USE_REFERENCE_C_CODE) has_vectors = mm_support() & MM_ALTIVEC; @@ -94,8 +94,24 @@ } while (nblocks != 0); av_freep(&s->exptab); #if defined(HAVE_MMX) - s->fft_calc = ff_fft_calc_sse; -#else +#ifdef HAVE_MM3DNOW + if (has_vectors & MM_3DNOWEXT) + /* 3DNowEx for Athlon(XP) */ + s->fft_calc = ff_fft_calc_3dn2; + else if (has_vectors & MM_3DNOW) + /* 3DNow! for K6-2/3 */ + s->fft_calc = ff_fft_calc_3dn; +#endif +#ifdef HAVE_BUILTIN_VECTOR + if (has_vectors & MM_SSE2) + /* SSE for P4/K8 */ + s->fft_calc = ff_fft_calc_sse; + else if ((has_vectors & MM_SSE) && + s->fft_calc == ff_fft_calc_c) + /* SSE for P3 */ + s->fft_calc = ff_fft_calc_sse; +#endif +#else /* HAVE_MMX */ s->fft_calc = ff_fft_calc_altivec; #endif }

3 2

CVS: ffmpeg/libavcodec wmadec.c,1.33,1.34
by michael＠mplayerhq.hu 10 Apr '06

10 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv19203 Modified Files: wmadec.c Log Message: reverting 1.31->1.33 fix coverity warning CID: 255 (uninitalized variable used to build tables which arent used, well there is a slight change of a FPU exception maybe ...) (by michael) Init simplification and 2% faster wma_decode_block on amd64 with tables use instead of pow(). (by banan) the init simplifictaion is not correct its not binary identical the pow optimization breaks decoding of http://klif-e.mos.net.au/videos/extr.wmv Index: wmadec.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/wmadec.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- wmadec.c 13 Mar 2006 23:29:00 -0000 1.33 +++ wmadec.c 30 Mar 2006 14:58:36 -0000 1.34 @@ -130,9 +130,6 @@ float lsp_pow_e_table[256]; float lsp_pow_m_table1[(1 << LSP_POW_BITS)]; float lsp_pow_m_table2[(1 << LSP_POW_BITS)]; - /* pow tables */ - float pow_005_10[121]; - float pow_00625_10[121]; #ifdef TRACE int frame_count; @@ -221,8 +218,8 @@ int i, flags1, flags2; float *window; uint8_t *extradata; - float bps, bps1; - volatile float high_freq_factor= 0; //initial value should not matter as the tables build from this are unused if !use_noise_coding + float bps1, high_freq; + volatile float bps; int sample_rate1; int coef_vlc_table; @@ -278,6 +275,7 @@ /* init rate dependant parameters */ s->use_noise_coding = 1; + high_freq = s->sample_rate * 0.5; /* if version 2, then the rates are normalized */ sample_rate1 = s->sample_rate; @@ -306,44 +304,44 @@ if (bps1 >= 0.61) s->use_noise_coding = 0; else - high_freq_factor = 0.4; + high_freq = high_freq * 0.4; } else if (sample_rate1 == 22050) { if (bps1 >= 1.16) s->use_noise_coding = 0; else if (bps1 >= 0.72) - high_freq_factor = 0.7; + high_freq = high_freq * 0.7; else - high_freq_factor = 0.6; + high_freq = high_freq * 0.6; } else if (sample_rate1 == 16000) { if (bps > 0.5) - high_freq_factor = 0.5; + high_freq = high_freq * 0.5; else - high_freq_factor = 0.3; + high_freq = high_freq * 0.3; } else if (sample_rate1 == 11025) { - high_freq_factor = 0.7; + high_freq = high_freq * 0.7; } else if (sample_rate1 == 8000) { if (bps <= 0.625) { - high_freq_factor = 0.5; + high_freq = high_freq * 0.5; } else if (bps > 0.75) { s->use_noise_coding = 0; } else { - high_freq_factor = 0.65; + high_freq = high_freq * 0.65; } } else { if (bps >= 0.8) { - high_freq_factor = 0.75; + high_freq = high_freq * 0.75; } else if (bps >= 0.6) { - high_freq_factor = 0.6; + high_freq = high_freq * 0.6; } else { - high_freq_factor = 0.5; + high_freq = high_freq * 0.5; } } dprintf("flags1=0x%x flags2=0x%x\n", flags1, flags2); dprintf("version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n", s->version, s->nb_channels, s->sample_rate, s->bit_rate, s->block_align); - dprintf("bps=%f bps1=%f bitoffset=%d\n", - bps, bps1, s->byte_offset_bits); + dprintf("bps=%f bps1=%f high_freq=%f bitoffset=%d\n", + bps, bps1, high_freq, s->byte_offset_bits); dprintf("use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n", s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes); @@ -416,8 +414,8 @@ /* max number of coefs */ s->coefs_end[k] = (s->frame_len - ((s->frame_len * 9) / 100)) >> k; /* high freq computation */ - s->high_band_start[k] = (int)((block_len * high_freq_factor) + 0.5); - + s->high_band_start[k] = (int)((block_len * 2 * high_freq) / + s->sample_rate + 0.5); n = s->exponent_sizes[k]; j = 0; pos = 0; @@ -529,13 +527,6 @@ &coef_vlcs[coef_vlc_table * 2]); init_coef_vlc(&s->coef_vlc[1], &s->run_table[1], &s->level_table[1], &coef_vlcs[coef_vlc_table * 2 + 1]); - - /* init pow tables */ - for (i=0 ; i<121 ; i++) { - s->pow_005_10[i] = pow(10, i * 0.05); - s->pow_00625_10[i] = pow(10, i * (1.0 / 16.0)); - } - return 0; } @@ -687,7 +678,8 @@ max_scale = 0; if (s->version == 1) { last_exp = get_bits(&s->gb, 5) + 10; - v = s->pow_00625_10[last_exp]; + /* XXX: use a table */ + v = pow(10, last_exp * (1.0 / 16.0)); max_scale = v; n = *ptr++; do { @@ -701,7 +693,8 @@ return -1; /* NOTE: this offset is the same as MPEG4 AAC ! */ last_exp += code - 60; - v = s->pow_00625_10[last_exp]; + /* XXX: use a table */ + v = pow(10, last_exp * (1.0 / 16.0)); if (v > max_scale) max_scale = v; n = *ptr++; @@ -946,7 +939,7 @@ coefs1 = s->coefs1[ch]; exponents = s->exponents[ch]; - mult = s->pow_005_10[total_gain] / s->max_exponent[ch]; + mult = pow(10, total_gain * 0.05) / s->max_exponent[ch]; mult *= mdct_norm; coefs = s->coefs[ch]; if (s->use_noise_coding) { @@ -993,7 +986,8 @@ if (j >= 0 && s->high_band_coded[ch][j]) { /* use noise with specified power */ mult1 = sqrt(exp_power[j] / exp_power[last_high_band]); - mult1 = mult1 * s->pow_005_10[s->high_band_values[ch][j]]; + /* XXX: use a table */ + mult1 = mult1 * pow(10, s->high_band_values[ch][j] * 0.05); mult1 = mult1 / (s->max_exponent[ch] * s->noise_mult); mult1 *= mdct_norm; for(i = 0;i < n; i++) {

3 3

CVS: ffmpeg/libavformat rtp.c,1.24,1.25
by rfelker＠mplayerhq.hu 01 Apr '06

01 Apr '06

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv5251 Modified Files: rtp.c Log Message: fix constraint violation: libavformat is not allowed to modify state of caller, including rng state Index: rtp.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/rtp.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- rtp.c 1 Mar 2006 22:45:27 -0000 1.24 +++ rtp.c 30 Mar 2006 16:44:32 -0000 1.25 @@ -532,9 +532,9 @@ payload_type = RTP_PT_PRIVATE; /* private payload type */ s->payload_type = payload_type; - s->base_timestamp = random(); + s->base_timestamp = 0; /* FIXME: was random(), what should this be? */ s->timestamp = s->base_timestamp; - s->ssrc = random(); + s->ssrc = 0; /* FIXME: was random(), what should this be? */ s->first_packet = 1; max_packet_size = url_fget_max_packet_size(&s1->pb);

6 6

CVS: ffmpeg/libavcodec dsputil.c, 1.137, 1.138 dsputil.h, 1.132, 1.133 imgconvert.c, 1.62, 1.63 mpegvideo.c, 1.512, 1.513
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv11526 Modified Files: dsputil.c dsputil.h imgconvert.c mpegvideo.c Log Message: remove mpegvideo.c img resample dependancy Index: dsputil.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.c,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- dsputil.c 23 Mar 2006 20:16:35 -0000 1.137 +++ dsputil.c 31 Mar 2006 20:43:37 -0000 1.138 @@ -4056,6 +4056,11 @@ c->inner_add_yblock = ff_snow_inner_add_yblock; #endif + c->shrink[0]= ff_img_copy_plane; + c->shrink[1]= ff_shrink22; + c->shrink[2]= ff_shrink44; + c->shrink[3]= ff_shrink88; + c->prefetch= just_return; #ifdef HAVE_MMX Index: dsputil.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- dsputil.h 24 Mar 2006 01:33:22 -0000 1.132 +++ dsputil.h 31 Mar 2006 20:43:37 -0000 1.133 @@ -76,6 +76,12 @@ void ff_vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); void ff_vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); +/* 1/2^n downscaling functions from imgconvert.c */ +void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); +void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); +void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); +void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); + /* minimum alignment rules ;) if u notice errors in the align stuff, need more alignment for some asm code for some cpu or need to use a function with less aligned data then send a mail to the ffmpeg-dev list, ... @@ -345,6 +351,8 @@ void (*inner_add_yblock)(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); void (*prefetch)(void *mem, int stride, int h); + + void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); } DSPContext; void dsputil_static_init(void); Index: imgconvert.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/imgconvert.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- imgconvert.c 10 Mar 2006 13:55:48 -0000 1.62 +++ imgconvert.c 31 Mar 2006 20:43:37 -0000 1.63 @@ -572,7 +572,7 @@ return dst_pix_fmt; } -static void img_copy_plane(uint8_t *dst, int dst_wrap, +void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height) { @@ -612,7 +612,7 @@ break; } bwidth = (width * bits + 7) >> 3; - img_copy_plane(dst->data[0], dst->linesize[0], + ff_img_copy_plane(dst->data[0], dst->linesize[0], src->data[0], src->linesize[0], bwidth, height); break; @@ -626,17 +626,17 @@ h >>= pf->y_chroma_shift; } bwidth = (w * pf->depth + 7) >> 3; - img_copy_plane(dst->data[i], dst->linesize[i], + ff_img_copy_plane(dst->data[i], dst->linesize[i], src->data[i], src->linesize[i], bwidth, h); } break; case FF_PIXEL_PALETTE: - img_copy_plane(dst->data[0], dst->linesize[0], + ff_img_copy_plane(dst->data[0], dst->linesize[0], src->data[0], src->linesize[0], width, height); /* copy the palette */ - img_copy_plane(dst->data[1], dst->linesize[1], + ff_img_copy_plane(dst->data[1], dst->linesize[1], src->data[1], src->linesize[1], 4, 256); break; @@ -1210,7 +1210,7 @@ } /* 2x2 -> 1x1 */ -static void shrink22(uint8_t *dst, int dst_wrap, +void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height) { @@ -1243,7 +1243,7 @@ } /* 4x4 -> 1x1 */ -static void shrink44(uint8_t *dst, int dst_wrap, +void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height) { @@ -1273,6 +1273,28 @@ } } +/* 8x8 -> 1x1 */ +void ff_shrink88(uint8_t *dst, int dst_wrap, + const uint8_t *src, int src_wrap, + int width, int height) +{ + int w, i; + + for(;height > 0; height--) { + for(w = width;w > 0; w--) { + int tmp=0; + for(i=0; i<8; i++){ + tmp += src[0] + src[1] + src[2] + src[3] + src[4] + src[5] + src[6] + src[7]; + src += src_wrap; + } + *(dst++) = (tmp + 32)>>6; + src += 8 - 8*src_wrap; + } + src += 8*src_wrap - 8*width; + dst += dst_wrap - width; + } +} + static void grow21_line(uint8_t *dst, const uint8_t *src, int width) { @@ -2023,7 +2045,7 @@ uint8_t *d; if (dst_pix->color_type == FF_COLOR_YUV_JPEG) { - img_copy_plane(dst->data[0], dst->linesize[0], + ff_img_copy_plane(dst->data[0], dst->linesize[0], src->data[0], src->linesize[0], dst_width, dst_height); } else { @@ -2051,7 +2073,7 @@ if (is_yuv_planar(src_pix) && dst_pix_fmt == PIX_FMT_GRAY8) { if (src_pix->color_type == FF_COLOR_YUV_JPEG) { - img_copy_plane(dst->data[0], dst->linesize[0], + ff_img_copy_plane(dst->data[0], dst->linesize[0], src->data[0], src->linesize[0], dst_width, dst_height); } else { @@ -2089,7 +2111,7 @@ YUV444 format */ switch(xy_shift) { case 0x00: - resize_func = img_copy_plane; + resize_func = ff_img_copy_plane; break; case 0x10: resize_func = shrink21; @@ -2101,10 +2123,10 @@ resize_func = shrink12; break; case 0x11: - resize_func = shrink22; + resize_func = ff_shrink22; break; case 0x22: - resize_func = shrink44; + resize_func = ff_shrink44; break; case 0xf0: resize_func = grow21; @@ -2126,7 +2148,7 @@ goto no_chroma_filter; } - img_copy_plane(dst->data[0], dst->linesize[0], + ff_img_copy_plane(dst->data[0], dst->linesize[0], src->data[0], src->linesize[0], dst_width, dst_height); Index: mpegvideo.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v retrieving revision 1.512 retrieving revision 1.513 diff -u -d -r1.512 -r1.513 --- mpegvideo.c 23 Mar 2006 21:54:46 -0000 1.512 +++ mpegvideo.c 31 Mar 2006 20:43:37 -0000 1.513 @@ -2180,10 +2180,11 @@ int i, j, out_size, p_lambda, b_lambda, lambda2; int outbuf_size= s->width * s->height; //FIXME uint8_t *outbuf= av_malloc(outbuf_size); - ImgReSampleContext *resample; int64_t best_rd= INT64_MAX; int best_b_count= -1; + assert(scale>=0 && scale <=3); + // emms_c(); p_lambda= s->last_lambda_for[P_TYPE]; //s->next_picture_ptr->quality; b_lambda= s->last_lambda_for[B_TYPE]; //p_lambda *ABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset; @@ -2205,8 +2206,6 @@ if (avcodec_open(c, codec) < 0) return -1; - resample= img_resample_init(c->width, c->height, s->width, s->height); //FIXME use sws - for(i=0; i<s->max_b_frames+2; i++){ int ysize= c->width*c->height; int csize= (c->width/2)*(c->height/2); @@ -2229,9 +2228,11 @@ input[i].linesize[1]= input[i].linesize[2]= c->width/2; - if(!i || s->input_picture[i-1]) - img_resample(resample, (AVPicture*)&input[i], - (AVPicture*)&pre_input); + if(!i || s->input_picture[i-1]){ + s->dsp.shrink[scale](input[i].data[0], input[i].linesize[0], pre_input.data[0], pre_input.linesize[0], c->width, c->height); + s->dsp.shrink[scale](input[i].data[1], input[i].linesize[1], pre_input.data[1], pre_input.linesize[1], c->width>>1, c->height>>1); + s->dsp.shrink[scale](input[i].data[2], input[i].linesize[2], pre_input.data[2], pre_input.linesize[2], c->width>>1, c->height>>1); + } } for(j=0; j<s->max_b_frames+1; j++){ @@ -2273,7 +2274,6 @@ av_freep(&outbuf); avcodec_close(c); av_freep(&c); - img_resample_close(resample); for(i=0; i<s->max_b_frames+2; i++){ av_freep(&input[i].data[0]);

1 0

CVS: ffmpeg/libavcodec bitstream.h,1.159,1.160
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv29973 Modified Files: bitstream.h Log Message: get_xbits() optimization Index: bitstream.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/bitstream.h,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 --- bitstream.h 8 Jan 2006 21:19:39 -0000 1.159 +++ bitstream.h 31 Mar 2006 20:40:22 -0000 1.160 @@ -574,21 +574,15 @@ * @author BERO */ static inline int get_xbits(GetBitContext *s, int n){ - register int tmp; + register int sign; register int32_t cache; OPEN_READER(re, s) UPDATE_CACHE(re, s) cache = GET_CACHE(re,s); - if ((int32_t)cache<0) { //MSB=1 - tmp = NEG_USR32(cache,n); - } else { - // tmp = (-1<<n) | NEG_USR32(cache,n) + 1; mpeg12.c algo - // tmp = - (NEG_USR32(cache,n) ^ ((1 << n) - 1)); h263.c algo - tmp = - NEG_USR32(~cache,n); - } + sign=(~cache)>>31; LAST_SKIP_BITS(re, s, n) CLOSE_READER(re, s) - return tmp; + return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; } static inline int get_sbits(GetBitContext *s, int n){

1 0

CVS: ffmpeg/libavcodec mjpeg.c,1.131,1.132
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv22758/libavcodec Modified Files: mjpeg.c Log Message: remove useless code Index: mjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- mjpeg.c 31 Mar 2006 18:04:36 -0000 1.131 +++ mjpeg.c 31 Mar 2006 18:22:35 -0000 1.132 @@ -1259,7 +1259,6 @@ int component, int dc_index, int ac_index, int16_t *quant_matrix) { int code, i, j, level, val; - VLC *ac_vlc; /* DC coef */ val = mjpeg_decode_dc(s, dc_index); @@ -1271,7 +1270,6 @@ s->last_dc[component] = val; block[0] = val; /* AC coefs */ - ac_vlc = &s->vlcs[1][ac_index]; i = 0; {OPEN_READER(re, &s->gb) for(;;) {

1 0

CVS: ffmpeg/libavcodec mjpeg.c,1.130,1.131
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv3224/libavcodec Modified Files: mjpeg.c Log Message: simplify loop a little Index: mjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- mjpeg.c 31 Mar 2006 17:43:28 -0000 1.130 +++ mjpeg.c 31 Mar 2006 18:04:36 -0000 1.131 @@ -1281,16 +1281,14 @@ /* EOB */ if (code == 0x10) break; - if (code == 0x100) { - i += 16; - } else { - i += ((unsigned)code) >> 4; + i += ((unsigned)code) >> 4; + if(code != 0x100){ code &= 0xf; if(code > MIN_CACHE_BITS - 16){ UPDATE_CACHE(re, &s->gb) } { - int cache=GET_CACHE(re,gb); + int cache=GET_CACHE(re,&s->gb); int sign=(~cache)>>31; level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign; }

1 0

CVS: ffmpeg/libavcodec mjpeg.c,1.129,1.130
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv23025 Modified Files: mjpeg.c Log Message: do UPDATE_CACHE only when needed (which should be VERY rare) Index: mjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- mjpeg.c 31 Mar 2006 17:01:58 -0000 1.129 +++ mjpeg.c 31 Mar 2006 17:43:28 -0000 1.130 @@ -1286,8 +1286,9 @@ } else { i += ((unsigned)code) >> 4; code &= 0xf; - - UPDATE_CACHE(re, &s->gb) + if(code > MIN_CACHE_BITS - 16){ + UPDATE_CACHE(re, &s->gb) + } { int cache=GET_CACHE(re,gb); int sign=(~cache)>>31;

1 0

CVS: ffmpeg/libavcodec mjpeg.c,1.128,1.129
by michael＠mplayerhq.hu 31 Mar '06

31 Mar '06

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv4728 Modified Files: mjpeg.c Log Message: + (sign&1) -> -sign (1 instruction less) Index: mjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- mjpeg.c 31 Mar 2006 16:50:43 -0000 1.128 +++ mjpeg.c 31 Mar 2006 17:01:58 -0000 1.129 @@ -1291,7 +1291,7 @@ { int cache=GET_CACHE(re,gb); int sign=(~cache)>>31; - level = (NEG_USR32(sign ^ cache,code) ^ sign) + (sign&1) ; + level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign; } LAST_SKIP_BITS(re, &s->gb, code)

1 0