October 2006 - ffmpeg-cvslog - lists.ffmpeg.org

r6416 - trunk/libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 02 Oct '06

02 Oct '06

Author: ods15 Date: Mon Oct 2 07:55:18 2006 New Revision: 6416 Modified: trunk/libavcodec/vorbis_enc.c Log: Original Commit: r5 | ods15 | 2006-09-16 17:29:04 +0300 (Sat, 16 Sep 2006) | 4 lines more "surrounding" stuff, main header. some cleanup. actually compiles now! doesn't do anything though Modified: trunk/libavcodec/vorbis_enc.c ============================================================================== --- trunk/libavcodec/vorbis_enc.c (original) +++ trunk/libavcodec/vorbis_enc.c Mon Oct 2 07:55:18 2006 @@ -52,16 +52,24 @@ } codebook_t; typedef struct { + int channels; + int sample_rate; + int blocksize[2]; + int ncodebooks; codebook_t * codebooks; } venc_context_t; -static inline int ilog(int a) { +static inline int ilog(unsigned int a) { int i; - for (i = 0; (a >> i) > 0; i++); + for (i = 0; a >> i; i++); return i; } +static void put_float(PutBitContext * pb, float f) { + put_bits(pb, 32, *(uint32_t*)&f); +} + static void put_codebook_header(PutBitContext * pb, codebook_t * cb) { int i; int ordered = 0; @@ -71,7 +79,7 @@ put_bits(pb, 24, cb->nentries); for (i = 1; i < cb->nentries; i++) if (cb->entries[i].len < cb->entries[i-1].len) break; - if (i == cb->entires) ordered = 1; + if (i == cb->nentries) ordered = 1; put_bits(pb, 1, ordered); if (ordered) { @@ -79,6 +87,7 @@ put_bits(pb, 5, len); i = 0; while (i < cb->nentries) { + int j; for (j = 0; j+i < cb->nentries; j++) if (cb->entries[j+i].len != len) break; put_bits(pb, 5, j); i += j; @@ -87,7 +96,7 @@ } else { int sparse = 0; for (i = 0; i < cb->nentries; i++) if (!cb->entries[i].len) break; - if (i != cb->entires) sparse = 1; + if (i != cb->nentries) sparse = 1; put_bits(pb, 1, sparse); for (i = 0; i < cb->nentries; i++) { @@ -111,50 +120,95 @@ for (i = 1; i < tmp; i++) bits = FFMIN(bits, ilog(cb->quantlist[i])); - put_float(bc, cb->min); - put_float(bc, cb->delta); + put_float(pb, cb->min); + put_float(pb, cb->delta); - put_bits(bc, 4, bits - 1); - put_bits(bc, 1, seq_p); + put_bits(pb, 4, bits - 1); + put_bits(pb, 1, cb->seq_p); - for (i = 0; i < tmp; i++) put_bits(bc, bits, cb->quantlist[i]) + for (i = 0; i < tmp; i++) put_bits(pb, bits, cb->quantlist[i]); } } -static void put_main_header(PutBitContext * pb, venc_context_t * venc) { +static int put_main_header(venc_context_t * venc, uint8_t ** out) { int i; - put_bits(pb, 8, 5); //magic - for (i = 0; "vorbis"[i]; i++) put_bits(pb, 8, "vorbis"[i]); + PutBitContext pb; + uint8_t buffer[50000] = {0}, * p = buffer; + int buffer_len = sizeof buffer; + int len, hlens[3]; + + // identification header + init_put_bits(&pb, p, buffer_len); + put_bits(&pb, 8, 1); //magic + for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]); + put_bits(&pb, 32, 0); // version + put_bits(&pb, 8, venc->channels); + put_bits(&pb, 32, venc->sample_rate); + put_bits(&pb, 32, 0); // bitrate + put_bits(&pb, 32, 0); // bitrate + put_bits(&pb, 32, 0); // bitrate + put_bits(&pb, 4, venc->blocksize[0]); + put_bits(&pb, 4, venc->blocksize[1]); + put_bits(&pb, 1, 1); // framing + + flush_put_bits(&pb); + hlens[0] = (put_bits_count(&pb) + 7) / 8; + buffer_len -= hlens[0]; + p += hlens[0]; + + // comment header + init_put_bits(&pb, p, buffer_len); + put_bits(&pb, 8, 3); //magic + for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]); + put_bits(&pb, 32, 0); // vendor length TODO + put_bits(&pb, 32, 0); // amount of comments + put_bits(&pb, 1, 1); // framing + + flush_put_bits(&pb); + hlens[1] = (put_bits_count(&pb) + 7) / 8; + buffer_len -= hlens[1]; + p += hlens[1]; + + // setup header + init_put_bits(&pb, p, buffer_len); + put_bits(&pb, 8, 5); //magic + for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]); + + // codebooks + put_bits(&pb, 8, venc->ncodebooks - 1); + for (i = 0; i < venc->ncodebooks; i++) put_codebook_header(&pb, &venc->codebooks[0]); + + + flush_put_bits(&pb); + hlens[2] = (put_bits_count(&pb) + 7) / 8; + + len = hlens[0] + hlens[1] + hlens[2]; + p = *out = av_mallocz(64 + len + len/255); + + *p++ = 2; + p += av_xiphlacing(p, hlens[0]); + p += av_xiphlacing(p, hlens[1]); + buffer_len = 0; + for (i = 0; i < 3; i++) { + memcpy(p, buffer + buffer_len, hlens[i]); + p += hlens[i]; + buffer_len += hlens[i]; + } - put_bits(pb, 8, venc->ncodebooks - 1); - for (i = 0; i < venc->ncodebooks; i++) put_codebook_header(pb, venc->codebooks[0]); + return p - *out; } static int vorbis_encode_init(AVCodecContext * avccontext) { venc_context_t * venc = avccontext->priv_data; - uint8_t *p; - unsigned int offset, len; - avccontext->channels; - avccontext->sample_rate; + venc->channels = avccontext->channels; + venc->sample_rate = avccontext->sample_rate; + //if (avccontext->flags & CODEC_FLAG_QSCALE) avccontext->global_quality / (float)FF_QP2LAMBDA); else avccontext->bit_rate; //if(avccontext->cutoff > 0) cfreq = avccontext->cutoff / 1000.0; - len = header.bytes + header_comm.bytes + header_code.bytes; - - p = avccontext->extradata = av_mallocz(64 + len + len/255); - p[0] = 2; - offset = 1; - offset += av_xiphlacing(&p[offset], header.bytes); - offset += av_xiphlacing(&p[offset], header_comm.bytes); - memcpy(&p[offset], header.packet, header.bytes); - offset += header.bytes; - memcpy(&p[offset], header_comm.packet, header_comm.bytes); - offset += header_comm.bytes; - memcpy(&p[offset], header_code.packet, header_code.bytes); - offset += header_code.bytes; - avccontext->extradata_size = offset; + avccontext->extradata_size = put_main_header(venc, (uint8_t**)&avccontext->extradata); avccontext->frame_size = VORBIS_FRAME_SIZE; @@ -167,17 +221,15 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * packets, int buf_size, void *data) { +#if 0 venc_context_t * venc = avccontext->priv_data; signed short * audio = data; - int l, samples = data ? VORBIS_FRAME_SIZE : 0; - - - - if (!l) return 0; + int samples = data ? VORBIS_FRAME_SIZE : 0; avccontext->coded_frame->pts = av_rescale_q(op2->granulepos, (AVRational){1, avccontext->sample_rate}, avccontext->time_base); memcpy(packets, compressed_frame, l); - return l; +#endif + return 0; }

1 0

r6415 - trunk/libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 02 Oct '06

02 Oct '06

Author: ods15 Date: Mon Oct 2 07:55:16 2006 New Revision: 6415 Modified: trunk/libavcodec/vorbis_enc.c Log: Original Commit: r4 | ods15 | 2006-09-16 15:36:03 +0300 (Sat, 16 Sep 2006) | 3 lines codebook header syntax small simplification for encode_init() Modified: trunk/libavcodec/vorbis_enc.c ============================================================================== --- trunk/libavcodec/vorbis_enc.c (original) +++ trunk/libavcodec/vorbis_enc.c Mon Oct 2 07:55:16 2006 @@ -27,15 +27,109 @@ #undef NDEBUG #include <assert.h> +#define ALT_BITSTREAM_READER_LE +#include "bitstream.h" + #define VORBIS_FRAME_SIZE 64 #define BUFFER_SIZE (1024*64) typedef struct { - uint8_t buffer[BUFFER_SIZE]; - int buffer_index; + int len; + uint32_t codeword; +} entry_t; + +typedef struct { + int nentries; + entry_t * entries; + int ndimentions; + float min; + float delta; + int seq_p; + int lookup; + //float * dimentions; + int * quantlist; +} codebook_t; + +typedef struct { + int ncodebooks; + codebook_t * codebooks; } venc_context_t; +static inline int ilog(int a) { + int i; + for (i = 0; (a >> i) > 0; i++); + return i; +} + +static void put_codebook_header(PutBitContext * pb, codebook_t * cb) { + int i; + int ordered = 0; + + put_bits(pb, 24, 0x564342); //magic + put_bits(pb, 16, cb->ndimentions); + put_bits(pb, 24, cb->nentries); + + for (i = 1; i < cb->nentries; i++) if (cb->entries[i].len < cb->entries[i-1].len) break; + if (i == cb->entires) ordered = 1; + + put_bits(pb, 1, ordered); + if (ordered) { + int len = cb->entries[0].len; + put_bits(pb, 5, len); + i = 0; + while (i < cb->nentries) { + for (j = 0; j+i < cb->nentries; j++) if (cb->entries[j+i].len != len) break; + put_bits(pb, 5, j); + i += j; + len++; + } + } else { + int sparse = 0; + for (i = 0; i < cb->nentries; i++) if (!cb->entries[i].len) break; + if (i != cb->entires) sparse = 1; + put_bits(pb, 1, sparse); + + for (i = 0; i < cb->nentries; i++) { + if (sparse) put_bits(pb, 1, !!cb->entries[i].len); + if (cb->entries[i].len) put_bits(pb, 5, cb->entries[i].len); + } + } + + put_bits(pb, 4, cb->lookup); + if (cb->lookup) { + int tmp, bits = ilog(cb->quantlist[0]); + + if (cb->lookup == 1) { + for (tmp = 0; ; tmp++) { + int n = 1; + for (i = 0; i < cb->ndimentions; i++) n *= tmp; + if (n > cb->nentries) break; + } + tmp--; + } else tmp = cb->ndimentions * cb->nentries; + + for (i = 1; i < tmp; i++) bits = FFMIN(bits, ilog(cb->quantlist[i])); + + put_float(bc, cb->min); + put_float(bc, cb->delta); + + put_bits(bc, 4, bits - 1); + put_bits(bc, 1, seq_p); + + for (i = 0; i < tmp; i++) put_bits(bc, bits, cb->quantlist[i]) + } +} + +static void put_main_header(PutBitContext * pb, venc_context_t * venc) { + int i; + put_bits(pb, 8, 5); //magic + for (i = 0; "vorbis"[i]; i++) put_bits(pb, 8, "vorbis"[i]); + + put_bits(pb, 8, venc->ncodebooks - 1); + for (i = 0; i < venc->ncodebooks; i++) put_codebook_header(pb, venc->codebooks[0]); +} + static int vorbis_encode_init(AVCodecContext * avccontext) { venc_context_t * venc = avccontext->priv_data; @@ -48,9 +142,8 @@ //if(avccontext->cutoff > 0) cfreq = avccontext->cutoff / 1000.0; len = header.bytes + header_comm.bytes + header_code.bytes; - avccontext->extradata_size = 64 + len + len/255; - p = avccontext->extradata = av_mallocz(avccontext->extradata_size); + p = avccontext->extradata = av_mallocz(64 + len + len/255); p[0] = 2; offset = 1; offset += av_xiphlacing(&p[offset], header.bytes); @@ -62,7 +155,6 @@ memcpy(&p[offset], header_code.packet, header_code.bytes); offset += header_code.bytes; avccontext->extradata_size = offset; - avccontext->extradata = av_realloc(avccontext->extradata, avccontext->extradata_size); avccontext->frame_size = VORBIS_FRAME_SIZE;

1 0

r6414 - trunk/libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 02 Oct '06

02 Oct '06

Author: ods15 Date: Mon Oct 2 07:55:14 2006 New Revision: 6414 Modified: trunk/libavcodec/vorbis_enc.c Log: Original Commit: r3 | ods15 | 2006-09-16 11:49:07 +0300 (Sat, 16 Sep 2006) | 2 lines cosmetics Modified: trunk/libavcodec/vorbis_enc.c ============================================================================== --- trunk/libavcodec/vorbis_enc.c (original) +++ trunk/libavcodec/vorbis_enc.c Mon Oct 2 07:55:14 2006 @@ -36,7 +36,8 @@ int buffer_index; } venc_context_t; -static int vorbis_encode_init(AVCodecContext * avccontext) { +static int vorbis_encode_init(AVCodecContext * avccontext) +{ venc_context_t * venc = avccontext->priv_data; uint8_t *p; unsigned int offset, len; @@ -63,7 +64,7 @@ avccontext->extradata_size = offset; avccontext->extradata = av_realloc(avccontext->extradata, avccontext->extradata_size); - avccontext->frame_size = OGGVORBIS_FRAME_SIZE; + avccontext->frame_size = VORBIS_FRAME_SIZE; avccontext->coded_frame = avcodec_alloc_frame(); avccontext->coded_frame->key_frame = 1;

1 0

r6413 - trunk/libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 02 Oct '06

02 Oct '06

Author: ods15 Date: Mon Oct 2 07:54:55 2006 New Revision: 6413 Added: trunk/libavcodec/vorbis_enc.c Log: skeleton for vorbis_enc.c Added: trunk/libavcodec/vorbis_enc.c ============================================================================== --- (empty file) +++ trunk/libavcodec/vorbis_enc.c Mon Oct 2 07:54:55 2006 @@ -0,0 +1,110 @@ +/* + * copyright (c) 2006 Oded Shimon <ods15 at ods15.dyndns.org> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file vorbis_enc.c + * Native Vorbis encoder. + * @author Oded Shimon <ods15 at ods15.dyndns.org> + */ + +#include "avcodec.h" + +#undef NDEBUG +#include <assert.h> + +#define VORBIS_FRAME_SIZE 64 + +#define BUFFER_SIZE (1024*64) + +typedef struct { + uint8_t buffer[BUFFER_SIZE]; + int buffer_index; +} venc_context_t; + +static int vorbis_encode_init(AVCodecContext * avccontext) { + venc_context_t * venc = avccontext->priv_data; + uint8_t *p; + unsigned int offset, len; + + avccontext->channels; + avccontext->sample_rate; + //if (avccontext->flags & CODEC_FLAG_QSCALE) avccontext->global_quality / (float)FF_QP2LAMBDA); else avccontext->bit_rate; + //if(avccontext->cutoff > 0) cfreq = avccontext->cutoff / 1000.0; + + len = header.bytes + header_comm.bytes + header_code.bytes; + avccontext->extradata_size = 64 + len + len/255; + + p = avccontext->extradata = av_mallocz(avccontext->extradata_size); + p[0] = 2; + offset = 1; + offset += av_xiphlacing(&p[offset], header.bytes); + offset += av_xiphlacing(&p[offset], header_comm.bytes); + memcpy(&p[offset], header.packet, header.bytes); + offset += header.bytes; + memcpy(&p[offset], header_comm.packet, header_comm.bytes); + offset += header_comm.bytes; + memcpy(&p[offset], header_code.packet, header_code.bytes); + offset += header_code.bytes; + avccontext->extradata_size = offset; + avccontext->extradata = av_realloc(avccontext->extradata, avccontext->extradata_size); + + avccontext->frame_size = OGGVORBIS_FRAME_SIZE; + + avccontext->coded_frame = avcodec_alloc_frame(); + avccontext->coded_frame->key_frame = 1; + + return 0; +} + + +static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * packets, int buf_size, void *data) +{ + venc_context_t * venc = avccontext->priv_data; + signed short * audio = data; + int l, samples = data ? VORBIS_FRAME_SIZE : 0; + + + + if (!l) return 0; + + avccontext->coded_frame->pts = av_rescale_q(op2->granulepos, (AVRational){1, avccontext->sample_rate}, avccontext->time_base); + memcpy(packets, compressed_frame, l); + return l; +} + + +static int vorbis_encode_close(AVCodecContext * avccontext) +{ + venc_context_t * venc = avccontext->priv_data; + + av_freep(&avccontext->coded_frame); + av_freep(&avccontext->extradata); + + return 0 ; +} + +AVCodec oggvorbis_encoder = { + "vorbis", + CODEC_TYPE_AUDIO, + CODEC_ID_VORBIS, + sizeof(venc_context_t), + vorbis_encode_init, + vorbis_encode_frame, + vorbis_encode_close, + .capabilities= CODEC_CAP_DELAY, +};

1 0

r6412 - in trunk/libavcodec: dsputil.c dsputil.h h263dec.c h264.c i386/dsputil_mmx.c i386/dsputil_mmx_avg.h mpegvideo.c
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: lorenm Date: Sun Oct 1 23:25:17 2006 New Revision: 6412 Modified: trunk/libavcodec/dsputil.c trunk/libavcodec/dsputil.h trunk/libavcodec/h263dec.c trunk/libavcodec/h264.c trunk/libavcodec/i386/dsputil_mmx.c trunk/libavcodec/i386/dsputil_mmx_avg.h trunk/libavcodec/mpegvideo.c Log: approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast. Modified: trunk/libavcodec/dsputil.c ============================================================================== --- trunk/libavcodec/dsputil.c (original) +++ trunk/libavcodec/dsputil.c Sun Oct 1 23:25:17 2006 @@ -4165,6 +4165,9 @@ c->prefetch= just_return; + memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); + memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); + #ifdef HAVE_MMX dsputil_init_mmx(c, avctx); #endif @@ -4193,6 +4196,13 @@ dsputil_init_bfin(c,avctx); #endif + for(i=0; i<64; i++){ + if(!c->put_2tap_qpel_pixels_tab[0][i]) + c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i]; + if(!c->avg_2tap_qpel_pixels_tab[0][i]) + c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i]; + } + switch(c->idct_permutation_type){ case FF_NO_IDCT_PERM: for(i=0; i<64; i++) Modified: trunk/libavcodec/dsputil.h ============================================================================== --- trunk/libavcodec/dsputil.h (original) +++ trunk/libavcodec/dsputil.h Sun Oct 1 23:25:17 2006 @@ -277,6 +277,9 @@ qpel_mc_func put_h264_qpel_pixels_tab[4][16]; qpel_mc_func avg_h264_qpel_pixels_tab[4][16]; + qpel_mc_func put_2tap_qpel_pixels_tab[4][16]; + qpel_mc_func avg_2tap_qpel_pixels_tab[4][16]; + h264_weight_func weight_h264_pixels_tab[10]; h264_biweight_func biweight_h264_pixels_tab[10]; Modified: trunk/libavcodec/h263dec.c ============================================================================== --- trunk/libavcodec/h263dec.c (original) +++ trunk/libavcodec/h263dec.c Sun Oct 1 23:25:17 2006 @@ -693,6 +693,17 @@ s->next_p_frame_damaged=0; } + if((s->avctx->flags2 & CODEC_FLAG2_FAST) && s->pict_type==B_TYPE){ + s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; + s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; + }else if((!s->no_rounding) || s->pict_type==B_TYPE){ + s->me.qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab; + s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; + }else{ + s->me.qpel_put= s->dsp.put_qpel_pixels_tab; + s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; + } + if(MPV_frame_start(s, avctx) < 0) return -1; Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Sun Oct 1 23:25:17 2006 @@ -3782,8 +3782,8 @@ xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); }else if(s->codec_id == CODEC_ID_H264){ hl_motion(h, dest_y, dest_cb, dest_cr, - s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, - s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab, + s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab, + s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab, s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab); } @@ -4885,6 +4885,14 @@ ); } + if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !s->current_picture.reference){ + s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; + s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; + }else{ + s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab; + s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab; + } + return 0; } Modified: trunk/libavcodec/i386/dsputil_mmx.c ============================================================================== --- trunk/libavcodec/i386/dsputil_mmx.c (original) +++ trunk/libavcodec/i386/dsputil_mmx.c Sun Oct 1 23:25:17 2006 @@ -2400,6 +2400,53 @@ QPEL_OP(avg_ , ff_pw_16, _ , AVG_MMX2_OP, mmx2) QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, PUT_OP, mmx2) +/***********************************/ +/* bilinear qpel: not compliant to any spec, only for -lavdopts fast */ + +#define QPEL_2TAP_XY(OPNAME, SIZE, MMX, XY, HPEL)\ +static void OPNAME ## 2tap_qpel ## SIZE ## _mc ## XY ## _ ## MMX(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## pixels ## SIZE ## HPEL(dst, src, stride, SIZE);\ +} +#define QPEL_2TAP_L3(OPNAME, SIZE, MMX, XY, S0, S1, S2)\ +static void OPNAME ## 2tap_qpel ## SIZE ## _mc ## XY ## _ ## MMX(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## 2tap_qpel ## SIZE ## _l3_ ## MMX(dst, src+S0, stride, SIZE, S1, S2);\ +} + +#define QPEL_2TAP(OPNAME, SIZE, MMX)\ +QPEL_2TAP_XY(OPNAME, SIZE, MMX, 20, _x2_ ## MMX)\ +QPEL_2TAP_XY(OPNAME, SIZE, MMX, 02, _y2_ ## MMX)\ +QPEL_2TAP_XY(OPNAME, SIZE, MMX, 22, _xy2_mmx)\ +static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc00_ ## MMX =\ + OPNAME ## qpel ## SIZE ## _mc00_ ## MMX;\ +static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc21_ ## MMX =\ + OPNAME ## 2tap_qpel ## SIZE ## _mc20_ ## MMX;\ +static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc12_ ## MMX =\ + OPNAME ## 2tap_qpel ## SIZE ## _mc02_ ## MMX;\ +static void OPNAME ## 2tap_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## pixels ## SIZE ## _y2_ ## MMX(dst, src+1, stride, SIZE);\ +}\ +static void OPNAME ## 2tap_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## pixels ## SIZE ## _x2_ ## MMX(dst, src+stride, stride, SIZE);\ +}\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 10, 0, 1, 0)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 30, 1, -1, 0)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 01, 0, stride, 0)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 03, stride, -stride, 0)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 11, 0, stride, 1)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 31, 1, stride, -1)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 13, stride, -stride, 1)\ +QPEL_2TAP_L3(OPNAME, SIZE, MMX, 33, stride+1, -stride, -1)\ + +QPEL_2TAP(put_, 16, mmx2) +QPEL_2TAP(avg_, 16, mmx2) +QPEL_2TAP(put_, 8, mmx2) +QPEL_2TAP(avg_, 8, mmx2) +QPEL_2TAP(put_, 16, 3dnow) +QPEL_2TAP(avg_, 16, 3dnow) +QPEL_2TAP(put_, 8, 3dnow) +QPEL_2TAP(avg_, 8, 3dnow) + + #if 0 static void just_return() { return; } #endif @@ -3276,6 +3323,11 @@ dspfunc(avg_h264_qpel, 0, 16); dspfunc(avg_h264_qpel, 1, 8); dspfunc(avg_h264_qpel, 2, 4); + + dspfunc(put_2tap_qpel, 0, 16); + dspfunc(put_2tap_qpel, 1, 8); + dspfunc(avg_2tap_qpel, 0, 16); + dspfunc(avg_2tap_qpel, 1, 8); #undef dspfunc c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_mmx2; @@ -3399,6 +3451,11 @@ dspfunc(avg_h264_qpel, 1, 8); dspfunc(avg_h264_qpel, 2, 4); + dspfunc(put_2tap_qpel, 0, 16); + dspfunc(put_2tap_qpel, 1, 8); + dspfunc(avg_2tap_qpel, 0, 16); + dspfunc(avg_2tap_qpel, 1, 8); + c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_3dnow; c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow; } Modified: trunk/libavcodec/i386/dsputil_mmx_avg.h ============================================================================== --- trunk/libavcodec/i386/dsputil_mmx_avg.h (original) +++ trunk/libavcodec/i386/dsputil_mmx_avg.h Sun Oct 1 23:25:17 2006 @@ -818,3 +818,51 @@ DEF(avg_pixels8_xy2)(block+8, pixels+8, line_size, h); } +#define QPEL_2TAP_L3(OPNAME) \ +static void DEF(OPNAME ## 2tap_qpel16_l3)(uint8_t *dst, uint8_t *src, int stride, int h, int off1, int off2){\ + asm volatile(\ + "1: \n\t"\ + "movq (%1,%2), %%mm0 \n\t"\ + "movq 8(%1,%2), %%mm1 \n\t"\ + PAVGB" (%1,%3), %%mm0 \n\t"\ + PAVGB" 8(%1,%3), %%mm1 \n\t"\ + PAVGB" (%1), %%mm0 \n\t"\ + PAVGB" 8(%1), %%mm1 \n\t"\ + STORE_OP( (%1,%4),%%mm0)\ + STORE_OP(8(%1,%4),%%mm1)\ + "movq %%mm0, (%1,%4) \n\t"\ + "movq %%mm1, 8(%1,%4) \n\t"\ + "add %5, %1 \n\t"\ + "decl %0 \n\t"\ + "jnz 1b \n\t"\ + :"+g"(h), "+r"(src)\ + :"r"((long)off1), "r"((long)off2),\ + "r"((long)(dst-src)), "r"((long)stride)\ + :"memory"\ + );\ +}\ +static void DEF(OPNAME ## 2tap_qpel8_l3)(uint8_t *dst, uint8_t *src, int stride, int h, int off1, int off2){\ + asm volatile(\ + "1: \n\t"\ + "movq (%1,%2), %%mm0 \n\t"\ + PAVGB" (%1,%3), %%mm0 \n\t"\ + PAVGB" (%1), %%mm0 \n\t"\ + STORE_OP((%1,%4),%%mm0)\ + "movq %%mm0, (%1,%4) \n\t"\ + "add %5, %1 \n\t"\ + "decl %0 \n\t"\ + "jnz 1b \n\t"\ + :"+g"(h), "+r"(src)\ + :"r"((long)off1), "r"((long)off2),\ + "r"((long)(dst-src)), "r"((long)stride)\ + :"memory"\ + );\ +} + +#define STORE_OP(a,b) PAVGB" "#a","#b" \n\t" +QPEL_2TAP_L3(avg_) +#undef STORE_OP +#define STORE_OP(a,b) +QPEL_2TAP_L3(put_) +#undef STORE_OP +#undef QPEL_2TAP_L3 Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Sun Oct 1 23:25:17 2006 @@ -3944,17 +3944,16 @@ MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); } }else{ + op_qpix= s->me.qpel_put; if ((!s->no_rounding) || s->pict_type==B_TYPE){ op_pix = s->dsp.put_pixels_tab; - op_qpix= s->dsp.put_qpel_pixels_tab; }else{ op_pix = s->dsp.put_no_rnd_pixels_tab; - op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; } if (s->mv_dir & MV_DIR_FORWARD) { MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); op_pix = s->dsp.avg_pixels_tab; - op_qpix= s->dsp.avg_qpel_pixels_tab; + op_qpix= s->me.qpel_avg; } if (s->mv_dir & MV_DIR_BACKWARD) { MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix);

1 0

r6411 - trunk/libavformat/avisynth.c
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: gpoirier Date: Sun Oct 1 22:41:02 2006 New Revision: 6411 Modified: trunk/libavformat/avisynth.c Log: add support for some MS DIB formats for avisynth Patch by Steve Lhomme % slhomme AH divxcorp P com % Original thread: Date: Sep 27, 2006 7:20 PM Subject: [Ffmpeg-devel] [PATCH] AVISynth support for some MS DIB formats Modified: trunk/libavformat/avisynth.c ============================================================================== --- trunk/libavformat/avisynth.c (original) +++ trunk/libavformat/avisynth.c Sun Oct 1 22:41:02 2006 @@ -94,6 +94,7 @@ stream->chunck_samples = wvfmt.nSamplesPerSec * (uint64_t)info.dwScale / (uint64_t)info.dwRate; stream->chunck_size = stream->chunck_samples * wvfmt.nChannels * wvfmt.wBitsPerSample / 8; + st->codec->codec_tag = wvfmt.wFormatTag; st->codec->codec_id = wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_sample); } else if (stream->info.fccType == streamtypeVIDEO) @@ -115,9 +116,10 @@ st->codec->width = imgfmt.bmiHeader.biWidth; st->codec->height = imgfmt.bmiHeader.biHeight; - st->codec->bits_per_sample = stream->info.dwSampleSize * 8; + st->codec->bits_per_sample = imgfmt.bmiHeader.biBitCount; st->codec->bit_rate = (uint64_t)stream->info.dwSampleSize * (uint64_t)stream->info.dwRate * 8 / (uint64_t)stream->info.dwScale; - st->codec->codec_id = codec_get_id(codec_bmp_tags, stream->info.fccHandler); + st->codec->codec_tag = imgfmt.bmiHeader.biCompression; + st->codec->codec_id = codec_get_id(codec_bmp_tags, imgfmt.bmiHeader.biCompression); st->duration = stream->info.dwLength; } @@ -128,7 +130,6 @@ } avs->nb_streams++; - st->codec->codec_tag = stream->info.fccHandler; st->codec->stream_codec_tag = stream->info.fccHandler;

1 0

r6409 - in trunk/libavcodec: vorbis.c vorbis.h
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: ods15 Date: Sun Oct 1 19:38:07 2006 New Revision: 6409 Modified: trunk/libavcodec/vorbis.c trunk/libavcodec/vorbis.h Log: remove render_line from vorbis.h, add ff_vorbis_floor1_render_list instead Modified: trunk/libavcodec/vorbis.c ============================================================================== --- trunk/libavcodec/vorbis.c (original) +++ trunk/libavcodec/vorbis.c Sun Oct 1 19:38:07 2006 @@ -1230,6 +1230,50 @@ return 0; } + +static void render_line(int x0, int y0, int x1, int y1, float * buf, int n) { + int dy = y1 - y0; + int adx = x1 - x0; + int ady = ABS(dy); + int base = dy / adx; + int x = x0; + int y = y0; + int err = 0; + int sy; + if (dy < 0) sy = base - 1; + else sy = base + 1; + ady = ady - ABS(base) * adx; + if (x >= n) return; + buf[x] = ff_vorbis_floor1_inverse_db_table[y]; + for (x = x0 + 1; x < x1; x++) { + if (x >= n) return; + err += ady; + if (err >= adx) { + err -= adx; + y += sy; + } else { + y += base; + } + buf[x] = ff_vorbis_floor1_inverse_db_table[y]; + } +} + +void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples) { + int lx, ly, i; + lx = 0; + ly = y_list[0] * multiplier; + for (i = 1; i < values; i++) { + int pos = list[i].sort; + if (flag[pos]) { + render_line(lx, ly, list[pos].x, y_list[pos] * multiplier, out, samples); + lx = list[pos].x; + ly = y_list[pos] * multiplier; + } + if (lx >= samples) break; + } + if (lx < samples) render_line(lx, ly, samples, ly, out, samples); +} + static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor_data *vfu, float *vec) { vorbis_floor1 * vf=&vfu->t1; GetBitContext *gb=&vc->gb; @@ -1237,7 +1281,7 @@ uint_fast16_t range=range_v[vf->multiplier-1]; uint_fast16_t floor1_Y[vf->x_list_dim]; uint_fast16_t floor1_Y_final[vf->x_list_dim]; - uint_fast8_t floor1_flag[vf->x_list_dim]; + int floor1_flag[vf->x_list_dim]; uint_fast8_t class_; uint_fast8_t cdim; uint_fast8_t cbits; @@ -1248,7 +1292,6 @@ uint_fast16_t i,j; /*u*/int_fast16_t adx, ady, off, predicted; // WTF ? dy/adx= (unsigned)dy/adx ? int_fast16_t dy, err; - uint_fast16_t lx,hx, ly, hy=0; if (!get_bits1(gb)) return 1; // silence @@ -1353,29 +1396,7 @@ // Curve synth - connect the calculated dots and convert from dB scale FIXME optimize ? - hx=0; - lx=0; - ly=floor1_Y_final[0]*vf->multiplier; // conforms to SPEC - - vec[0]=ff_vorbis_floor1_inverse_db_table[ly]; - - for(i=1;i<vf->x_list_dim;++i) { - AV_DEBUG(" Looking at post %d \n", i); - - if (floor1_flag[vf->list[i].sort]) { // SPEC mispelled - hy=floor1_Y_final[vf->list[i].sort]*vf->multiplier; - hx=vf->list[vf->list[i].sort].x; - - render_line(lx, ly, hx, hy, vec, vc->blocksize[1]); - - lx=hx; - ly=hy; - } - } - - if (hx<vf->list[1].x) { - render_line(hx, hy, vf->list[1].x, hy, vec, vc->blocksize[1]); - } + ff_vorbis_floor1_render_list(vf->list, vf->x_list_dim, floor1_Y_final, floor1_flag, vf->multiplier, vec, vf->list[1].x); AV_DEBUG(" Floor decoded\n"); Modified: trunk/libavcodec/vorbis.h ============================================================================== --- trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis.h Sun Oct 1 19:38:07 2006 @@ -34,33 +34,7 @@ void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values); unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num); - -static void attribute_unused render_line(int x0, int y0, int x1, int y1, float * buf, int n) { - int dy = y1 - y0; - int adx = x1 - x0; - int ady = ABS(dy); - int base = dy / adx; - int x = x0; - int y = y0; - int err = 0; - int sy; - if (dy < 0) sy = base - 1; - else sy = base + 1; - ady = ady - ABS(base) * adx; - if (x >= n) return; - buf[x] = ff_vorbis_floor1_inverse_db_table[y]; - for (x = x0 + 1; x < x1; x++) { - if (x >= n) return; - err += ady; - if (err >= adx) { - err -= adx; - y += sy; - } else { - y += base; - } - buf[x] = ff_vorbis_floor1_inverse_db_table[y]; - } -} +void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples); #define ilog(i) av_log2(2*(i))

3 2

r6410 - trunk/libavcodec/dv.c
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: diego Date: Sun Oct 1 20:19:49 2006 New Revision: 6410 Modified: trunk/libavcodec/dv.c Log: Fix compilation with --disable-encoders. patch by Alexander Strange, astrange at ithinksw dot com Modified: trunk/libavcodec/dv.c ============================================================================== --- trunk/libavcodec/dv.c (original) +++ trunk/libavcodec/dv.c Sun Oct 1 20:19:49 2006 @@ -1196,7 +1196,7 @@ } - +#ifdef CONFIG_ENCODERS static int dvvideo_encode_frame(AVCodecContext *c, uint8_t *buf, int buf_size, void *data) { @@ -1223,6 +1223,7 @@ return s->sys->frame_size; } +#endif static int dvvideo_close(AVCodecContext *c) {

1 0

r6408 - in trunk: ffmpeg.c ffplay.c ffserver.c
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: diego Date: Sun Oct 1 19:26:15 2006 New Revision: 6408 Modified: trunk/ffmpeg.c trunk/ffplay.c trunk/ffserver.c Log: Update copyright year and mention other copyright holders. Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Sun Oct 1 19:26:15 2006 @@ -3846,7 +3846,7 @@ static void show_banner(void) { - fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2004 Fabrice Bellard\n"); + fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\n"); fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); fprintf(stderr, " libavutil version: " AV_STRINGIFY(LIBAVUTIL_VERSION) "\n"); fprintf(stderr, " libavcodec version: " AV_STRINGIFY(LIBAVCODEC_VERSION) "\n"); Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c (original) +++ trunk/ffplay.c Sun Oct 1 19:26:15 2006 @@ -2385,7 +2385,7 @@ void show_help(void) { - printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003 Fabrice Bellard\n" + printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003-2006 Fabrice Bellard, et al.\n" "usage: ffplay [options] input_file\n" "Simple media player\n"); printf("\n"); Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c (original) +++ trunk/ffserver.c Sun Oct 1 19:26:15 2006 @@ -4417,7 +4417,7 @@ static void show_banner(void) { - printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2003 Fabrice Bellard\n"); + printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\n"); } static void show_help(void)

1 0

r6406 - trunk/Makefile
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: diego Date: Sun Oct 1 18:33:31 2006 New Revision: 6406 Modified: trunk/Makefile Log: make depend should recurse into libswscale as well. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sun Oct 1 18:33:31 2006 @@ -208,6 +208,9 @@ ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc depend endif +ifeq ($(CONFIG_SWSCALER),yes) + $(MAKE) -C libswscale depend +endif ifeq ($(BUILD_VHOOK),yes) $(MAKE) -C vhook depend endif

1 0

r6405 - trunk/Makefile
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: diego Date: Sun Oct 1 17:24:31 2006 New Revision: 6405 Modified: trunk/Makefile Log: Remove bogus .PHONY declaration from version.h target. Should fix make dep to be invoked before distclean under some circumstances. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sun Oct 1 17:24:31 2006 @@ -92,7 +92,6 @@ cp -p $< $@ $(STRIP) $@ -.PHONY: version.h version.h: $(SRC_PATH)/version.sh "$(SRC_PATH)"

1 0

r6404 - trunk/libavcodec/vorbis.h
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: ods15 Date: Sun Oct 1 15:53:08 2006 New Revision: 6404 Modified: trunk/libavcodec/vorbis.h Log: prevent warning in vorbis_data.c Modified: trunk/libavcodec/vorbis.h ============================================================================== --- trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis.h Sun Oct 1 15:53:08 2006 @@ -35,7 +35,7 @@ unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num); -static void render_line(int x0, int y0, int x1, int y1, float * buf, int n) { +static void attribute_unused render_line(int x0, int y0, int x1, int y1, float * buf, int n) { int dy = y1 - y0; int adx = x1 - x0; int ady = ABS(dy);

1 0

r6403 - trunk/libavcodec/vorbis.h
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: ods15 Date: Sun Oct 1 15:45:17 2006 New Revision: 6403 Modified: trunk/libavcodec/vorbis.h Log: 100l, broke ffmpeg compilation, ABS() and uint* types not defined in vorbis_data.c Modified: trunk/libavcodec/vorbis.h ============================================================================== --- trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis.h Sun Oct 1 15:45:17 2006 @@ -19,6 +19,8 @@ #ifndef VORBIS_H #define VORBIS_H +#include "avcodec.h" + extern const float ff_vorbis_floor1_inverse_db_table[256]; extern const float * ff_vorbis_vwin[8];

1 0

r6402 - in trunk/libavcodec: vorbis.c vorbis.h
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: ods15 Date: Sun Oct 1 13:59:33 2006 New Revision: 6402 Modified: trunk/libavcodec/vorbis.c trunk/libavcodec/vorbis.h Log: make some more functions global so they can be shared with vorbis_enc.c Modified: trunk/libavcodec/vorbis.c ============================================================================== --- trunk/libavcodec/vorbis.c (original) +++ trunk/libavcodec/vorbis.c Sun Oct 1 13:59:33 2006 @@ -160,12 +160,10 @@ /* Helper functions */ -#define ilog(i) av_log2(2*(i)) - #define BARK(x) \ (13.1f*atan(0.00074f*(x))+2.24f*atan(1.85e-8f*(x)*(x))+1e-4f*(x)) -static unsigned int nth_root(unsigned int x, unsigned int n) { // x^(1/n) +unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) { // x^(1/n) unsigned int ret=0, i, j; do { @@ -186,7 +184,7 @@ // Generate vlc codes from vorbis huffman code lengths -static int vorbis_len2vlc(vorbis_context *vc, uint_fast8_t *bits, uint_fast32_t *codes, uint_fast32_t num) { +int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) { uint_fast32_t exit_at_level[33]={404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; @@ -209,12 +207,12 @@ } #ifdef V_DEBUG - av_log(vc->avccontext, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]); + av_log(NULL, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]); init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]); for(i=0;i<bits[p];++i) { - av_log(vc->avccontext, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); + av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); } - av_log(vc->avccontext, AV_LOG_INFO, "\n"); + av_log(NULL, AV_LOG_INFO, "\n"); #endif ++p; @@ -235,17 +233,19 @@ codes[p]=code; #ifdef V_DEBUG - av_log(vc->avccontext, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]); + av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]); init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]); for(i=0;i<bits[p];++i) { - av_log(vc->avccontext, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); + av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); } - av_log(vc->avccontext, AV_LOG_INFO, "\n"); + av_log(NULL, AV_LOG_INFO, "\n"); #endif } - //FIXME no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) + //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) + for (p=1; p<33; p++) + if (exit_at_level[p]) return 1; return 0; } @@ -336,8 +336,8 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) { uint_fast16_t cb; - uint_fast8_t *tmp_vlc_bits; - uint_fast32_t *tmp_vlc_codes; + uint8_t *tmp_vlc_bits; + uint32_t *tmp_vlc_codes; GetBitContext *gb=&vc->gb; vc->codebook_count=get_bits(gb,8)+1; @@ -345,8 +345,8 @@ AV_DEBUG(" Codebooks: %d \n", vc->codebook_count); vc->codebooks=(vorbis_codebook *)av_mallocz(vc->codebook_count * sizeof(vorbis_codebook)); - tmp_vlc_bits=(uint_fast8_t *)av_mallocz(V_MAX_VLCS * sizeof(uint_fast8_t)); - tmp_vlc_codes=(uint_fast32_t *)av_mallocz(V_MAX_VLCS * sizeof(uint_fast32_t)); + tmp_vlc_bits=(uint8_t *)av_mallocz(V_MAX_VLCS * sizeof(uint8_t)); + tmp_vlc_codes=(uint32_t *)av_mallocz(V_MAX_VLCS * sizeof(uint32_t)); for(cb=0;cb<vc->codebook_count;++cb) { vorbis_codebook *codebook_setup=&vc->codebooks[cb]; @@ -439,7 +439,7 @@ if (codebook_setup->lookup_type==1) { uint_fast16_t i, j, k; - uint_fast16_t codebook_lookup_values=nth_root(entries, codebook_setup->dimensions); + uint_fast16_t codebook_lookup_values=ff_vorbis_nth_root(entries, codebook_setup->dimensions); uint_fast16_t codebook_multiplicands[codebook_lookup_values]; float codebook_minimum_value=vorbisfloat2float(get_bits_long(gb, 32)); @@ -503,7 +503,7 @@ } // Initialize VLC table - if (vorbis_len2vlc(vc, tmp_vlc_bits, tmp_vlc_codes, entries)) { + if (ff_vorbis_len2vlc(tmp_vlc_bits, tmp_vlc_codes, entries)) { av_log(vc->avccontext, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n"); goto error; } @@ -1363,59 +1363,10 @@ AV_DEBUG(" Looking at post %d \n", i); if (floor1_flag[vf->list[i].sort]) { // SPEC mispelled - int_fast16_t x, y, dy, base, sy; // if uncommented: dy = -32 adx = 2 base = 2blablabla ????? - hy=floor1_Y_final[vf->list[i].sort]*vf->multiplier; hx=vf->list[vf->list[i].sort].x; - dy=hy-ly; - adx=hx-lx; - ady= (dy<0) ? -dy:dy;//ABS(dy); - base=(int16_t)dy/(int16_t)adx; - - AV_DEBUG(" dy %d adx %d base %d = %d \n", dy, adx, base, dy/adx); - - x=lx; - y=ly; - err=0; - if (dy<0) { - sy=base-1; - } else { - sy=base+1; - } - ady=ady-(base<0 ? -base : base)*adx; - vec[x]=ff_vorbis_floor1_inverse_db_table[y]; - - AV_DEBUG(" vec[ %d ] = %d \n", x, y); - - for(x=lx+1;(x<hx) && (x<vf->list[1].x);++x) { - err+=ady; - if (err>=adx) { - err-=adx; - y+=sy; - } else { - y+=base; - } - vec[x]=ff_vorbis_floor1_inverse_db_table[y]; - - AV_DEBUG(" vec[ %d ] = %d \n", x, y); - } - -/* for(j=1;j<hx-lx+1;++j) { // iterating render_point - dy=hy-ly; - adx=hx-lx; - ady= dy<0 ? -dy : dy; - err=ady*j; - off=err/adx; - if (dy<0) { - predicted=ly-off; - } else { - predicted=ly+off; - } - if (lx+j < vf->x_list[1]) { - vec[lx+j]=ff_vorbis_floor1_inverse_db_table[predicted]; - } - }*/ + render_line(lx, ly, hx, hy, vec, vc->blocksize[1]); lx=hx; ly=hy; @@ -1423,9 +1374,7 @@ } if (hx<vf->list[1].x) { - for(i=hx;i<vf->list[1].x;++i) { - vec[i]=ff_vorbis_floor1_inverse_db_table[hy]; - } + render_line(hx, hy, vf->list[1].x, hy, vec, vc->blocksize[1]); } AV_DEBUG(" Floor decoded\n"); Modified: trunk/libavcodec/vorbis.h ============================================================================== --- trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis.h Sun Oct 1 13:59:33 2006 @@ -30,5 +30,36 @@ } floor1_entry_t; void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values); +unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) +int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num); + +static void render_line(int x0, int y0, int x1, int y1, float * buf, int n) { + int dy = y1 - y0; + int adx = x1 - x0; + int ady = ABS(dy); + int base = dy / adx; + int x = x0; + int y = y0; + int err = 0; + int sy; + if (dy < 0) sy = base - 1; + else sy = base + 1; + ady = ady - ABS(base) * adx; + if (x >= n) return; + buf[x] = ff_vorbis_floor1_inverse_db_table[y]; + for (x = x0 + 1; x < x1; x++) { + if (x >= n) return; + err += ady; + if (err >= adx) { + err -= adx; + y += sy; + } else { + y += base; + } + buf[x] = ff_vorbis_floor1_inverse_db_table[y]; + } +} + +#define ilog(i) av_log2(2*(i)) #endif

1 0

r6401 - in trunk/libavcodec: vorbis.c vorbis.h
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: ods15 Date: Sun Oct 1 13:11:30 2006 New Revision: 6401 Modified: trunk/libavcodec/vorbis.c trunk/libavcodec/vorbis.h Log: make ready_floor1_list() shared for vorbis_enc.c Modified: trunk/libavcodec/vorbis.c ============================================================================== --- trunk/libavcodec/vorbis.c (original) +++ trunk/libavcodec/vorbis.c Sun Oct 1 13:11:30 2006 @@ -88,10 +88,7 @@ int_fast16_t subclass_books[16][8]; uint_fast8_t multiplier; uint_fast16_t x_list_dim; - uint_fast16_t *x_list; - uint_fast16_t *x_list_order; - uint_fast16_t *low_neighbour; - uint_fast16_t *high_neighbour; + floor1_entry_t * list; } t1; } data; } vorbis_floor; @@ -253,6 +250,36 @@ return 0; } +void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values) { + int i; + list[0].sort = 0; + list[1].sort = 1; + for (i = 2; i < values; i++) { + int j; + list[i].low = 0; + list[i].high = 1; + list[i].sort = i; + for (j = 2; j < i; j++) { + int tmp = list[j].x; + if (tmp < list[i].x) { + if (tmp > list[list[i].low].x) list[i].low = j; + } else { + if (tmp < list[list[i].high].x) list[i].high = j; + } + } + } + for (i = 0; i < values - 1; i++) { + int j; + for (j = i + 1; j < values; j++) { + if (list[list[i].sort].x > list[list[j].sort].x) { + int tmp = list[i].sort; + list[i].sort = list[j].sort; + list[j].sort = tmp; + } + } + } +} + // Free all allocated memory ----------------------------------------- static void vorbis_free(vorbis_context *vc) { @@ -285,10 +312,7 @@ av_free(vc->floors[i].data.t0.lsp); } else { - av_free(vc->floors[i].data.t1.x_list); - av_free(vc->floors[i].data.t1.x_list_order); - av_free(vc->floors[i].data.t1.low_neighbour); - av_free(vc->floors[i].data.t1.high_neighbour); + av_free(vc->floors[i].data.t1.list); } } av_freep(&vc->floors); @@ -600,57 +624,23 @@ floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; } - floor_setup->data.t1.x_list=(uint_fast16_t *)av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(uint_fast16_t)); - floor_setup->data.t1.x_list_order=(uint_fast16_t *)av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(uint_fast16_t)); - floor_setup->data.t1.low_neighbour=(uint_fast16_t *)av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(uint_fast16_t)); - floor_setup->data.t1.high_neighbour=(uint_fast16_t *)av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(uint_fast16_t)); + floor_setup->data.t1.list=(floor1_entry_t *)av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(floor1_entry_t)); rangebits=get_bits(gb, 4); - floor_setup->data.t1.x_list[0] = 0; - floor_setup->data.t1.x_list[1] = (1<<rangebits); + floor_setup->data.t1.list[0].x = 0; + floor_setup->data.t1.list[1].x = (1<<rangebits); for(j=0;j<floor_setup->data.t1.partitions;++j) { for(k=0;k<floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]];++k,++floor1_values) { - floor_setup->data.t1.x_list[floor1_values]=get_bits(gb, rangebits); + floor_setup->data.t1.list[floor1_values].x=get_bits(gb, rangebits); - AV_DEBUG(" %d. floor1 Y coord. %d \n", floor1_values, floor_setup->data.t1.x_list[floor1_values]); + AV_DEBUG(" %d. floor1 Y coord. %d \n", floor1_values, floor_setup->data.t1.list[floor1_values].x); } } // Precalculate order of x coordinates - needed for decode - - for(k=0;k<floor_setup->data.t1.x_list_dim;++k) { - floor_setup->data.t1.x_list_order[k]=k; - } - - for(k=0;k<floor_setup->data.t1.x_list_dim-1;++k) { // FIXME optimize sorting ? - for(j=k+1;j<floor_setup->data.t1.x_list_dim;++j) { - if(floor_setup->data.t1.x_list[floor_setup->data.t1.x_list_order[k]]>floor_setup->data.t1.x_list[floor_setup->data.t1.x_list_order[j]]) { - uint_fast16_t tmp=floor_setup->data.t1.x_list_order[k]; - floor_setup->data.t1.x_list_order[k]=floor_setup->data.t1.x_list_order[j]; - floor_setup->data.t1.x_list_order[j]=tmp; - } - } - } - -// Precalculate low and high neighbours - - for(k=2;k<floor_setup->data.t1.x_list_dim;++k) { - floor_setup->data.t1.low_neighbour[k]=0; - floor_setup->data.t1.high_neighbour[k]=1; // correct according to SPEC requirements - - for (j=0;j<k;++j) { - if ((floor_setup->data.t1.x_list[j]<floor_setup->data.t1.x_list[k]) && - (floor_setup->data.t1.x_list[j]>floor_setup->data.t1.x_list[floor_setup->data.t1.low_neighbour[k]])) { - floor_setup->data.t1.low_neighbour[k]=j; - } - if ((floor_setup->data.t1.x_list[j]>floor_setup->data.t1.x_list[k]) && - (floor_setup->data.t1.x_list[j]<floor_setup->data.t1.x_list[floor_setup->data.t1.high_neighbour[k]])) { - floor_setup->data.t1.high_neighbour[k]=j; - } - } - } + ff_vorbis_ready_floor1_list(floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim); } else if(floor_setup->floor_type==0) { uint_fast8_t max_codebook_dim=0; @@ -1256,7 +1246,6 @@ int_fast16_t book; uint_fast16_t offset; uint_fast16_t i,j; - uint_fast16_t *floor_x_sort=vf->x_list_order; /*u*/int_fast16_t adx, ady, off, predicted; // WTF ? dy/adx= (unsigned)dy/adx ? int_fast16_t dy, err; uint_fast16_t lx,hx, ly, hy=0; @@ -1299,7 +1288,7 @@ floor1_Y[offset+j]=0; } - AV_DEBUG(" floor(%d) = %d \n", vf->x_list[offset+j], floor1_Y[offset+j]); + AV_DEBUG(" floor(%d) = %d \n", vf->list[offset+j].x, floor1_Y[offset+j]); } offset+=cdim; } @@ -1316,12 +1305,12 @@ uint_fast16_t high_neigh_offs; uint_fast16_t low_neigh_offs; - low_neigh_offs=vf->low_neighbour[i]; - high_neigh_offs=vf->high_neighbour[i]; + low_neigh_offs=vf->list[i].low; + high_neigh_offs=vf->list[i].high; dy=floor1_Y_final[high_neigh_offs]-floor1_Y_final[low_neigh_offs]; // render_point begin - adx=vf->x_list[high_neigh_offs]-vf->x_list[low_neigh_offs]; + adx=vf->list[high_neigh_offs].x-vf->list[low_neigh_offs].x; ady= ABS(dy); - err=ady*(vf->x_list[i]-vf->x_list[low_neigh_offs]); + err=ady*(vf->list[i].x-vf->list[low_neigh_offs].x); off=(int16_t)err/(int16_t)adx; if (dy<0) { predicted=floor1_Y_final[low_neigh_offs]-off; @@ -1359,7 +1348,7 @@ floor1_Y_final[i]=predicted; } - AV_DEBUG(" Decoded floor(%d) = %d / val %d \n", vf->x_list[i], floor1_Y_final[i], val); + AV_DEBUG(" Decoded floor(%d) = %d / val %d \n", vf->list[i].x, floor1_Y_final[i], val); } // Curve synth - connect the calculated dots and convert from dB scale FIXME optimize ? @@ -1373,11 +1362,11 @@ for(i=1;i<vf->x_list_dim;++i) { AV_DEBUG(" Looking at post %d \n", i); - if (floor1_flag[floor_x_sort[i]]) { // SPEC mispelled + if (floor1_flag[vf->list[i].sort]) { // SPEC mispelled int_fast16_t x, y, dy, base, sy; // if uncommented: dy = -32 adx = 2 base = 2blablabla ????? - hy=floor1_Y_final[floor_x_sort[i]]*vf->multiplier; - hx=vf->x_list[floor_x_sort[i]]; + hy=floor1_Y_final[vf->list[i].sort]*vf->multiplier; + hx=vf->list[vf->list[i].sort].x; dy=hy-ly; adx=hx-lx; @@ -1399,7 +1388,7 @@ AV_DEBUG(" vec[ %d ] = %d \n", x, y); - for(x=lx+1;(x<hx) && (x<vf->x_list[1]);++x) { + for(x=lx+1;(x<hx) && (x<vf->list[1].x);++x) { err+=ady; if (err>=adx) { err-=adx; @@ -1433,8 +1422,8 @@ } } - if (hx<vf->x_list[1]) { - for(i=hx;i<vf->x_list[1];++i) { + if (hx<vf->list[1].x) { + for(i=hx;i<vf->list[1].x;++i) { vec[i]=ff_vorbis_floor1_inverse_db_table[hy]; } } Modified: trunk/libavcodec/vorbis.h ============================================================================== --- trunk/libavcodec/vorbis.h (original) +++ trunk/libavcodec/vorbis.h Sun Oct 1 13:11:30 2006 @@ -22,4 +22,13 @@ extern const float ff_vorbis_floor1_inverse_db_table[256]; extern const float * ff_vorbis_vwin[8]; +typedef struct { + uint_fast16_t x; + uint_fast16_t sort; + uint_fast16_t low; + uint_fast16_t high; +} floor1_entry_t; + +void ff_vorbis_ready_floor1_list(floor1_entry_t * list, int values); + #endif

1 0

r6400 - in trunk/libavcodec: qdrw.c smacker.c truemotion2.c tscc.c vmnc.c zmbv.c
by subversion＠mplayerhq.hu 01 Oct '06

01 Oct '06

Author: kostya Date: Sun Oct 1 07:09:20 2006 New Revision: 6400 Modified: trunk/libavcodec/qdrw.c trunk/libavcodec/smacker.c trunk/libavcodec/truemotion2.c trunk/libavcodec/tscc.c trunk/libavcodec/vmnc.c trunk/libavcodec/zmbv.c Log: 1l: correct argument order in avcodec_check_dimensions Modified: trunk/libavcodec/qdrw.c ============================================================================== --- trunk/libavcodec/qdrw.c (original) +++ trunk/libavcodec/qdrw.c Sun Oct 1 07:09:20 2006 @@ -136,7 +136,7 @@ static int decode_init(AVCodecContext *avctx){ // QdrawContext * const a = avctx->priv_data; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } Modified: trunk/libavcodec/smacker.c ============================================================================== --- trunk/libavcodec/smacker.c (original) +++ trunk/libavcodec/smacker.c Sun Oct 1 07:09:20 2006 @@ -520,7 +520,7 @@ c->pic.data[0] = NULL; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } Modified: trunk/libavcodec/truemotion2.c ============================================================================== --- trunk/libavcodec/truemotion2.c (original) +++ trunk/libavcodec/truemotion2.c Sun Oct 1 07:09:20 2006 @@ -822,7 +822,7 @@ TM2Context * const l = avctx->priv_data; int i; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return -1; } if((avctx->width & 3) || (avctx->height & 3)){ Modified: trunk/libavcodec/tscc.c ============================================================================== --- trunk/libavcodec/tscc.c (original) +++ trunk/libavcodec/tscc.c Sun Oct 1 07:09:20 2006 @@ -264,7 +264,7 @@ c->pic.data[0] = NULL; c->height = avctx->height; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } Modified: trunk/libavcodec/vmnc.c ============================================================================== --- trunk/libavcodec/vmnc.c (original) +++ trunk/libavcodec/vmnc.c Sun Oct 1 07:09:20 2006 @@ -467,7 +467,7 @@ c->width = avctx->width; c->height = avctx->height; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } c->bpp = avctx->bits_per_sample; Modified: trunk/libavcodec/zmbv.c ============================================================================== --- trunk/libavcodec/zmbv.c (original) +++ trunk/libavcodec/zmbv.c Sun Oct 1 07:09:20 2006 @@ -616,7 +616,7 @@ c->width = avctx->width; c->height = avctx->height; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { + if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { return 1; } c->bpp = avctx->bits_per_sample;

1 0