July 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r14478 - trunk/libavutil/lfg.h
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: michael Date: Thu Jul 31 01:08:07 2008 New Revision: 14478 Log: Add a multiplicative LFG for thouse thinking the additative isnt good enough, just 4 lines of code. Modified: trunk/libavutil/lfg.h Modified: trunk/libavutil/lfg.h ============================================================================== --- trunk/libavutil/lfg.h (original) +++ trunk/libavutil/lfg.h Thu Jul 31 01:08:07 2008 @@ -30,7 +30,7 @@ typedef struct { void av_lfg_init(AVLFG *c, unsigned int seed); /** - * Gets the next random unsigned 32bit number. + * Gets the next random unsigned 32bit number using a ALFG. * * Please also consider a simple LCG like state= state*1664525+1013904223, * it may be good enough and faster for your specific use case. @@ -40,4 +40,15 @@ static inline unsigned int av_lfg_get(AV return c->state[c->index++ & 63]; } +/** + * Gets the next random unsigned 32bit number using a MLFG. + * + * Please also consider the av_lfg_get() above, it is faster. + */ +static inline unsigned int av_mlfg_get(AVLFG *c){ + unsigned int a= c->state[(c->index-55) & 63]; + unsigned int b= c->state[(c->index-24) & 63]; + return c->state[c->index++ & 63] = a*b+a+b; +} + #endif //FFMPEG_LFG_H

1 0

r14477 - trunk/libavformat/avidec.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: bcoudurier Date: Wed Jul 30 23:07:54 2008 New Revision: 14477 Log: change assert test due to the new reducing of time_base in av_set_pts_info, fix #561 Modified: trunk/libavformat/avidec.c Modified: trunk/libavformat/avidec.c ============================================================================== --- trunk/libavformat/avidec.c (original) +++ trunk/libavformat/avidec.c Wed Jul 30 23:07:54 2008 @@ -1026,8 +1026,7 @@ static int avi_read_seek(AVFormatContext continue; // assert(st2->codec->block_align); - assert(st2->time_base.den == ast2->rate); - assert(st2->time_base.num == ast2->scale); + assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale); index = av_index_search_timestamp( st2, av_rescale(timestamp, st2->time_base.den*(int64_t)st->time_base.num, st->time_base.den * (int64_t)st2->time_base.num),

1 0

r14476 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: michael Date: Wed Jul 30 20:21:51 2008 New Revision: 14476 Log: Simplify intra PCM MB handling. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Wed Jul 30 20:21:51 2008 @@ -2502,30 +2502,12 @@ static av_always_inline void hl_decode_m } if (!simple && IS_INTRA_PCM(mb_type)) { - unsigned int x, y; - - // The pixels are stored in h->mb array in the same order as levels, - // copy them in output in the correct order. - for(i=0; i<16; i++) { - for (y=0; y<4; y++) { - for (x=0; x<4; x++) { - *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x]; - } - } - } - for(i=16; i<16+4; i++) { - for (y=0; y<4; y++) { - for (x=0; x<4; x++) { - *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; - } - } + for (i=0; i<16; i++) { + memcpy(dest_y + i* linesize, h->mb + i*8, 16); } - for(i=20; i<20+4; i++) { - for (y=0; y<4; y++) { - for (x=0; x<4; x++) { - *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; - } - } + for (i=0; i<8; i++) { + memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8); + memcpy(dest_cr+ i*uvlinesize, h->mb + 160 + i*4, 8); } } else { if(IS_INTRA(mb_type)){ @@ -4405,34 +4387,14 @@ decode_intra_mb: h->slice_table[ mb_xy ]= h->slice_num; if(IS_INTRA_PCM(mb_type)){ - unsigned int x, y; + unsigned int x; // We assume these blocks are very rare so we do not optimize it. align_get_bits(&s->gb); // The pixels are stored in the same order as levels in h->mb array. - for(y=0; y<16; y++){ - const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); - for(x=0; x<16; x++){ - tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); - h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); - } - } - if(CHROMA){ - for(y=0; y<8; y++){ - const int index= 256 + 4*(y&3) + 32*(y>>2); - for(x=0; x<8; x++){ - tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); - h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); - } - } - for(y=0; y<8; y++){ - const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); - for(x=0; x<8; x++){ - tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); - h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); - } - } + for(x=0; x < (CHROMA ? 384 : 256); x++){ + ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8); } // In deblocking, the quantizer is 0 @@ -5545,7 +5507,6 @@ decode_intra_mb: if(IS_INTRA_PCM(mb_type)) { const uint8_t *ptr; - unsigned int x, y; // We assume these blocks are very rare so we do not optimize it. // FIXME The two following lines get the bitstream position in the cabac @@ -5557,28 +5518,9 @@ decode_intra_mb: } // The pixels are stored in the same order as levels in h->mb array. - for(y=0; y<16; y++){ - const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); - for(x=0; x<16; x++){ - tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", *ptr); - h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++; - } - } + memcpy(h->mb, ptr, 256); ptr+=256; if(CHROMA){ - for(y=0; y<8; y++){ - const int index= 256 + 4*(y&3) + 32*(y>>2); - for(x=0; x<8; x++){ - tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", *ptr); - h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; - } - } - for(y=0; y<8; y++){ - const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); - for(x=0; x<8; x++){ - tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", *ptr); - h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; - } - } + memcpy(h->mb+128, ptr, 128); ptr+=128; } ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);

1 0

r14475 - trunk/libavutil/internal.h
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: diego Date: Wed Jul 30 14:02:22 2008 New Revision: 14475 Log: USE_FASTMEMCPY is now called CONFIG_FASTMEMCPY in MPlayer. Modified: trunk/libavutil/internal.h Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h (original) +++ trunk/libavutil/internal.h Wed Jul 30 14:02:22 2008 @@ -106,7 +106,7 @@ # define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F)) #endif -#ifdef USE_FASTMEMCPY +#ifdef CONFIG_FASTMEMCPY # include "libvo/fastmemcpy.h" # define memcpy(a,b,c) fast_memcpy(a,b,c) #endif

4 6

r14474 - trunk/libavformat/electronicarts.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: pross Date: Wed Jul 30 09:41:32 2008 New Revision: 14474 Log: EA Demuxer: make rev2 flag optional Modified: trunk/libavformat/electronicarts.c Modified: trunk/libavformat/electronicarts.c ============================================================================== --- trunk/libavformat/electronicarts.c (original) +++ trunk/libavformat/electronicarts.c Wed Jul 30 09:41:32 2008 @@ -178,6 +178,7 @@ static int process_audio_header_elements } switch (revision2) { case 8: ea->audio_codec = CODEC_ID_PCM_S16LE_PLANAR; break; + case -1: break; default: av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2); return 0;

1 0

r14473 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: bcoudurier Date: Wed Jul 30 03:55:59 2008 New Revision: 14473 Log: add a bunch of new xdcam hd422 fourccs Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c (original) +++ trunk/libavformat/isom.c Wed Jul 30 03:55:59 2008 @@ -115,7 +115,28 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */ + { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */ //{ CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */

1 0

r14472 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: bcoudurier Date: Wed Jul 30 03:41:12 2008 New Revision: 14472 Log: more hdv fourccs Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c (original) +++ trunk/libavformat/isom.c Wed Jul 30 03:41:12 2008 @@ -106,6 +106,9 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */

1 0

r14471 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 30 Jul '08

30 Jul '08

Author: bcoudurier Date: Wed Jul 30 03:39:20 2008 New Revision: 14471 Log: update hdv fourcc descriptions Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c (original) +++ trunk/libavformat/isom.c Wed Jul 30 03:39:20 2008 @@ -102,10 +102,10 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* HDV 720p30 */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* HDV produced by FCP */ - { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* HDV 720p25 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */

1 0

r14470 - trunk/doc/general.texi
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: pross Date: Tue Jul 29 23:45:23 2008 New Revision: 14470 Log: give additional use case for version bumping; remove no longer true statement about version strings Modified: trunk/doc/general.texi Modified: trunk/doc/general.texi ============================================================================== --- trunk/doc/general.texi (original) +++ trunk/doc/general.texi Tue Jul 29 23:45:23 2008 @@ -898,11 +898,12 @@ should also be avoided if they don't mak @item Remember to check if you need to bump versions for the specific libav parts (libavutil, libavcodec, libavformat) you are changing. You need - to change the version integer and the version string. + to change the version integer. Incrementing the first component means no backward compatibility to previous versions (e.g. removal of a function from the public API). Incrementing the second component means backward compatible change - (e.g. addition of a function to the public API). + (e.g. addition of a function to the public API or extension of an + existing data structure). Incrementing the third component means a noteworthy binary compatible change (e.g. encoder bug fix that matters for the decoder). @item

1 0

r14469 - trunk/libavcodec/ra288.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: vitor Date: Tue Jul 29 20:22:31 2008 New Revision: 14469 Log: Do not declare a counter as unsigned when it is not needed Modified: trunk/libavcodec/ra288.c Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Tue Jul 29 20:22:31 2008 @@ -171,7 +171,7 @@ static void do_hybrid_window(int order, float *out, float *hist, float *out2, const float *window) { - unsigned int i; + int i; float buffer1[order + 1]; float buffer2[order + 1]; float work[order + n + non_rec];

4 4