wmv2: move IDCT to its own DSP context.
This allows us to remove FF_IDCT_WMV2, which serves no practical purpose other than to be able to select the WMV2 IDCT for MPEG (or vice versa) and get corrupt output. Fate tests for all wmv2-related tests change, because (for some obscure reason) they forced use of the MPEG IDCT. You would get the same changes previously by not using -idct simple in the fate test (or replacing it with -idct auto).
This commit is contained in:
		
							parent
							
								
									8a4f26206d
								
							
						
					
					
						commit
						e6bc38fd49
					
				| @ -410,10 +410,10 @@ OBJS-$(CONFIG_WMAVOICE_DECODER)        += wmavoice.o \ | ||||
|                                           celp_filters.o \
 | ||||
|                                           acelp_vectors.o acelp_filters.o | ||||
| OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4.o msmpeg4data.o | ||||
| OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o        \
 | ||||
| OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \
 | ||||
|                                           msmpeg4.o msmpeg4data.o \
 | ||||
|                                           intrax8.o intrax8dsp.o | ||||
| OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o \
 | ||||
| OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
 | ||||
|                                           msmpeg4.o msmpeg4enc.o msmpeg4data.o \
 | ||||
|                                           mpeg4videodec.o ituh263dec.o h263dec.o | ||||
| OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o | ||||
|  | ||||
| @ -2482,90 +2482,6 @@ static void vector_clip_int32_c(int32_t *dst, const int32_t *src, int32_t min, | ||||
|     } while (len > 0); | ||||
| } | ||||
| 
 | ||||
| #define W0 2048 | ||||
| #define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */ | ||||
| #define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */ | ||||
| #define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */ | ||||
| #define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */ | ||||
| #define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */ | ||||
| #define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */ | ||||
| #define W7 565  /* 2048*sqrt (2)*cos (7*pi/16) */ | ||||
| 
 | ||||
| static void wmv2_idct_row(short * b) | ||||
| { | ||||
|     int s1,s2; | ||||
|     int a0,a1,a2,a3,a4,a5,a6,a7; | ||||
|     /*step 1*/ | ||||
|     a1 = W1*b[1]+W7*b[7]; | ||||
|     a7 = W7*b[1]-W1*b[7]; | ||||
|     a5 = W5*b[5]+W3*b[3]; | ||||
|     a3 = W3*b[5]-W5*b[3]; | ||||
|     a2 = W2*b[2]+W6*b[6]; | ||||
|     a6 = W6*b[2]-W2*b[6]; | ||||
|     a0 = W0*b[0]+W0*b[4]; | ||||
|     a4 = W0*b[0]-W0*b[4]; | ||||
|     /*step 2*/ | ||||
|     s1 = (181*(a1-a5+a7-a3)+128)>>8;//1,3,5,7,
 | ||||
|     s2 = (181*(a1-a5-a7+a3)+128)>>8; | ||||
|     /*step 3*/ | ||||
|     b[0] = (a0+a2+a1+a5 + (1<<7))>>8; | ||||
|     b[1] = (a4+a6 +s1   + (1<<7))>>8; | ||||
|     b[2] = (a4-a6 +s2   + (1<<7))>>8; | ||||
|     b[3] = (a0-a2+a7+a3 + (1<<7))>>8; | ||||
|     b[4] = (a0-a2-a7-a3 + (1<<7))>>8; | ||||
|     b[5] = (a4-a6 -s2   + (1<<7))>>8; | ||||
|     b[6] = (a4+a6 -s1   + (1<<7))>>8; | ||||
|     b[7] = (a0+a2-a1-a5 + (1<<7))>>8; | ||||
| } | ||||
| static void wmv2_idct_col(short * b) | ||||
| { | ||||
|     int s1,s2; | ||||
|     int a0,a1,a2,a3,a4,a5,a6,a7; | ||||
|     /*step 1, with extended precision*/ | ||||
|     a1 = (W1*b[8*1]+W7*b[8*7] + 4)>>3; | ||||
|     a7 = (W7*b[8*1]-W1*b[8*7] + 4)>>3; | ||||
|     a5 = (W5*b[8*5]+W3*b[8*3] + 4)>>3; | ||||
|     a3 = (W3*b[8*5]-W5*b[8*3] + 4)>>3; | ||||
|     a2 = (W2*b[8*2]+W6*b[8*6] + 4)>>3; | ||||
|     a6 = (W6*b[8*2]-W2*b[8*6] + 4)>>3; | ||||
|     a0 = (W0*b[8*0]+W0*b[8*4]    )>>3; | ||||
|     a4 = (W0*b[8*0]-W0*b[8*4]    )>>3; | ||||
|     /*step 2*/ | ||||
|     s1 = (181*(a1-a5+a7-a3)+128)>>8; | ||||
|     s2 = (181*(a1-a5-a7+a3)+128)>>8; | ||||
|     /*step 3*/ | ||||
|     b[8*0] = (a0+a2+a1+a5 + (1<<13))>>14; | ||||
|     b[8*1] = (a4+a6 +s1   + (1<<13))>>14; | ||||
|     b[8*2] = (a4-a6 +s2   + (1<<13))>>14; | ||||
|     b[8*3] = (a0-a2+a7+a3 + (1<<13))>>14; | ||||
| 
 | ||||
|     b[8*4] = (a0-a2-a7-a3 + (1<<13))>>14; | ||||
|     b[8*5] = (a4-a6 -s2   + (1<<13))>>14; | ||||
|     b[8*6] = (a4+a6 -s1   + (1<<13))>>14; | ||||
|     b[8*7] = (a0+a2-a1-a5 + (1<<13))>>14; | ||||
| } | ||||
| void ff_wmv2_idct_c(short * block){ | ||||
|     int i; | ||||
| 
 | ||||
|     for(i=0;i<64;i+=8){ | ||||
|         wmv2_idct_row(block+i); | ||||
|     } | ||||
|     for(i=0;i<8;i++){ | ||||
|         wmv2_idct_col(block+i); | ||||
|     } | ||||
| } | ||||
| /* XXX: those functions should be suppressed ASAP when all IDCTs are
 | ||||
|  converted */ | ||||
| static void ff_wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) | ||||
| { | ||||
|     ff_wmv2_idct_c(block); | ||||
|     put_pixels_clamped_c(block, dest, line_size); | ||||
| } | ||||
| static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) | ||||
| { | ||||
|     ff_wmv2_idct_c(block); | ||||
|     add_pixels_clamped_c(block, dest, line_size); | ||||
| } | ||||
| static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block) | ||||
| { | ||||
|     ff_j_rev_dct (block); | ||||
| @ -2650,11 +2566,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) | ||||
|             c->idct_add= ff_jref_idct_add; | ||||
|             c->idct    = ff_j_rev_dct; | ||||
|             c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; | ||||
|         }else if(avctx->idct_algo==FF_IDCT_WMV2){ | ||||
|             c->idct_put= ff_wmv2_idct_put_c; | ||||
|             c->idct_add= ff_wmv2_idct_add_c; | ||||
|             c->idct    = ff_wmv2_idct_c; | ||||
|             c->idct_permutation_type= FF_NO_IDCT_PERM; | ||||
|         }else if(avctx->idct_algo==FF_IDCT_FAAN){ | ||||
|             c->idct_put= ff_faanidct_put; | ||||
|             c->idct_add= ff_faanidct_add; | ||||
|  | ||||
| @ -46,7 +46,6 @@ void ff_fdct248_islow_8(DCTELEM *data); | ||||
| void ff_fdct248_islow_10(DCTELEM *data); | ||||
| 
 | ||||
| void ff_j_rev_dct (DCTELEM *data); | ||||
| void ff_wmv2_idct_c(DCTELEM *data); | ||||
| 
 | ||||
| void ff_fdct_mmx(DCTELEM *block); | ||||
| void ff_fdct_mmxext(DCTELEM *block); | ||||
|  | ||||
| @ -28,8 +28,24 @@ | ||||
| av_cold void ff_wmv2_common_init(Wmv2Context * w){ | ||||
|     MpegEncContext * const s= &w->s; | ||||
| 
 | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], ff_wmv2_scantableA); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB); | ||||
|     ff_wmv2dsp_init(&w->wdsp); | ||||
|     ff_init_scantable_permutation(s->dsp.idct_permutation, | ||||
|                                   w->wdsp.idct_perm); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], | ||||
|                       ff_wmv2_scantableA); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], | ||||
|                       ff_wmv2_scantableB); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, | ||||
|                       ff_wmv1_scantable[1]); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, | ||||
|                       ff_wmv1_scantable[2]); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, | ||||
|                       ff_wmv1_scantable[3]); | ||||
|     ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable, | ||||
|                       ff_wmv1_scantable[0]); | ||||
|     s->dsp.idct_put = w->wdsp.idct_put; | ||||
|     s->dsp.idct_add = w->wdsp.idct_add; | ||||
|     s->dsp.idct     = NULL; | ||||
| } | ||||
| 
 | ||||
| static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ | ||||
| @ -38,7 +54,7 @@ static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int st | ||||
|   if (s->block_last_index[n] >= 0) { | ||||
|     switch(w->abt_type_table[n]){ | ||||
|     case 0: | ||||
|         s->dsp.idct_add (dst, stride, block1); | ||||
|         w->wdsp.idct_add(dst, stride, block1); | ||||
|         break; | ||||
|     case 1: | ||||
|         ff_simple_idct84_add(dst           , stride, block1); | ||||
|  | ||||
| @ -25,6 +25,7 @@ | ||||
| #include "dsputil.h" | ||||
| #include "mpegvideo.h" | ||||
| #include "intrax8.h" | ||||
| #include "wmv2dsp.h" | ||||
| 
 | ||||
| #define SKIP_TYPE_NONE 0 | ||||
| #define SKIP_TYPE_MPEG 1 | ||||
| @ -35,6 +36,7 @@ | ||||
| typedef struct Wmv2Context{ | ||||
|     MpegEncContext s; | ||||
|     IntraX8Context x8; | ||||
|     WMV2DSPContext wdsp; | ||||
|     int j_type_bit; | ||||
|     int j_type; | ||||
|     int abt_flag; | ||||
|  | ||||
| @ -447,10 +447,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) | ||||
| static av_cold int wmv2_decode_init(AVCodecContext *avctx){ | ||||
|     Wmv2Context * const w= avctx->priv_data; | ||||
| 
 | ||||
|     if(avctx->idct_algo==FF_IDCT_AUTO){ | ||||
|         avctx->idct_algo=FF_IDCT_WMV2; | ||||
|     } | ||||
| 
 | ||||
|     if(ff_msmpeg4_decode_init(avctx) < 0) | ||||
|         return -1; | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										145
									
								
								libavcodec/wmv2dsp.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										145
									
								
								libavcodec/wmv2dsp.c
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,145 @@ | ||||
| /*
 | ||||
|  * This file is part of Libav. | ||||
|  * | ||||
|  * Libav 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.1 of the License, or (at your option) any later version. | ||||
|  * | ||||
|  * Libav 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 Libav; if not, write to the Free Software | ||||
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
|  */ | ||||
| 
 | ||||
| #include "libavutil/attributes.h" | ||||
| #include "libavutil/common.h" | ||||
| #include "avcodec.h" | ||||
| #include "wmv2dsp.h" | ||||
| 
 | ||||
| #define W0 2048 | ||||
| #define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */ | ||||
| #define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */ | ||||
| #define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */ | ||||
| #define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */ | ||||
| #define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */ | ||||
| #define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */ | ||||
| #define W7 565  /* 2048*sqrt (2)*cos (7*pi/16) */ | ||||
| 
 | ||||
| static void wmv2_idct_row(short * b) | ||||
| { | ||||
|     int s1, s2; | ||||
|     int a0, a1, a2, a3, a4, a5, a6, a7; | ||||
| 
 | ||||
|     /* step 1 */ | ||||
|     a1 = W1 * b[1] + W7 * b[7]; | ||||
|     a7 = W7 * b[1] - W1 * b[7]; | ||||
|     a5 = W5 * b[5] + W3 * b[3]; | ||||
|     a3 = W3 * b[5] - W5 * b[3]; | ||||
|     a2 = W2 * b[2] + W6 * b[6]; | ||||
|     a6 = W6 * b[2] - W2 * b[6]; | ||||
|     a0 = W0 * b[0] + W0 * b[4]; | ||||
|     a4 = W0 * b[0] - W0 * b[4]; | ||||
| 
 | ||||
|     /* step 2 */ | ||||
|     s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8; // 1, 3, 5, 7
 | ||||
|     s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8; | ||||
| 
 | ||||
|     /* step 3 */ | ||||
|     b[0] = (a0 + a2 + a1 + a5 + (1 << 7)) >> 8; | ||||
|     b[1] = (a4 + a6 + s1      + (1 << 7)) >> 8; | ||||
|     b[2] = (a4 - a6 + s2      + (1 << 7)) >> 8; | ||||
|     b[3] = (a0 - a2 + a7 + a3 + (1 << 7)) >> 8; | ||||
|     b[4] = (a0 - a2 - a7 - a3 + (1 << 7)) >> 8; | ||||
|     b[5] = (a4 - a6 - s2      + (1 << 7)) >> 8; | ||||
|     b[6] = (a4 + a6 - s1      + (1 << 7)) >> 8; | ||||
|     b[7] = (a0 + a2 - a1 - a5 + (1 << 7)) >> 8; | ||||
| } | ||||
| 
 | ||||
| static void wmv2_idct_col(short * b) | ||||
| { | ||||
|     int s1, s2; | ||||
|     int a0, a1, a2, a3, a4, a5, a6, a7; | ||||
| 
 | ||||
|     /* step 1, with extended precision */ | ||||
|     a1 = (W1 * b[8 * 1] + W7 * b[8 * 7] + 4) >> 3; | ||||
|     a7 = (W7 * b[8 * 1] - W1 * b[8 * 7] + 4) >> 3; | ||||
|     a5 = (W5 * b[8 * 5] + W3 * b[8 * 3] + 4) >> 3; | ||||
|     a3 = (W3 * b[8 * 5] - W5 * b[8 * 3] + 4) >> 3; | ||||
|     a2 = (W2 * b[8 * 2] + W6 * b[8 * 6] + 4) >> 3; | ||||
|     a6 = (W6 * b[8 * 2] - W2 * b[8 * 6] + 4) >> 3; | ||||
|     a0 = (W0 * b[8 * 0] + W0 * b[8 * 4]    ) >> 3; | ||||
|     a4 = (W0 * b[8 * 0] - W0 * b[8 * 4]    ) >> 3; | ||||
| 
 | ||||
|     /* step 2 */ | ||||
|     s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8; | ||||
|     s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8; | ||||
| 
 | ||||
|     /* step 3 */ | ||||
|     b[8 * 0] = (a0 + a2 + a1 + a5 + (1 << 13)) >> 14; | ||||
|     b[8 * 1] = (a4 + a6 + s1      + (1 << 13)) >> 14; | ||||
|     b[8 * 2] = (a4 - a6 + s2      + (1 << 13)) >> 14; | ||||
|     b[8 * 3] = (a0 - a2 + a7 + a3 + (1 << 13)) >> 14; | ||||
| 
 | ||||
|     b[8 * 4] = (a0 - a2 - a7 - a3 + (1 << 13)) >> 14; | ||||
|     b[8 * 5] = (a4 - a6 - s2      + (1 << 13)) >> 14; | ||||
|     b[8 * 6] = (a4 + a6 - s1      + (1 << 13)) >> 14; | ||||
|     b[8 * 7] = (a0 + a2 - a1 - a5 + (1 << 13)) >> 14; | ||||
| } | ||||
| 
 | ||||
| static void wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) | ||||
| { | ||||
|     int i; | ||||
| 
 | ||||
|     for (i = 0; i < 64; i += 8) | ||||
|         wmv2_idct_row(block + i); | ||||
|     for (i = 0; i < 8; i++) | ||||
|         wmv2_idct_col(block + i); | ||||
| 
 | ||||
|     for (i = 0; i < 8; i++) { | ||||
|         dest[0] = av_clip_uint8(dest[0] + block[0]); | ||||
|         dest[1] = av_clip_uint8(dest[1] + block[1]); | ||||
|         dest[2] = av_clip_uint8(dest[2] + block[2]); | ||||
|         dest[3] = av_clip_uint8(dest[3] + block[3]); | ||||
|         dest[4] = av_clip_uint8(dest[4] + block[4]); | ||||
|         dest[5] = av_clip_uint8(dest[5] + block[5]); | ||||
|         dest[6] = av_clip_uint8(dest[6] + block[6]); | ||||
|         dest[7] = av_clip_uint8(dest[7] + block[7]); | ||||
|         dest += line_size; | ||||
|         block += 8; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| static void wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) | ||||
| { | ||||
|     int i; | ||||
| 
 | ||||
|     for (i = 0; i < 64; i += 8) | ||||
|         wmv2_idct_row(block + i); | ||||
|     for (i = 0; i < 8; i++) | ||||
|         wmv2_idct_col(block + i); | ||||
| 
 | ||||
|     for (i = 0; i < 8; i++) { | ||||
|         dest[0] = av_clip_uint8(block[0]); | ||||
|         dest[1] = av_clip_uint8(block[1]); | ||||
|         dest[2] = av_clip_uint8(block[2]); | ||||
|         dest[3] = av_clip_uint8(block[3]); | ||||
|         dest[4] = av_clip_uint8(block[4]); | ||||
|         dest[5] = av_clip_uint8(block[5]); | ||||
|         dest[6] = av_clip_uint8(block[6]); | ||||
|         dest[7] = av_clip_uint8(block[7]); | ||||
|         dest += line_size; | ||||
|         block += 8; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| av_cold void ff_wmv2dsp_init(WMV2DSPContext *c) | ||||
| { | ||||
|     c->idct_add  = wmv2_idct_add_c; | ||||
|     c->idct_put  = wmv2_idct_put_c; | ||||
|     c->idct_perm = FF_NO_IDCT_PERM; | ||||
| } | ||||
							
								
								
									
										34
									
								
								libavcodec/wmv2dsp.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								libavcodec/wmv2dsp.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,34 @@ | ||||
| /*
 | ||||
|  * This file is part of Libav. | ||||
|  * | ||||
|  * Libav 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.1 of the License, or (at your option) any later version. | ||||
|  * | ||||
|  * Libav 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 Libav; if not, write to the Free Software | ||||
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
|  */ | ||||
| 
 | ||||
| #ifndef AVCODEC_WMV2DSP_H | ||||
| #define AVCODEC_WMV2DSP_H | ||||
| 
 | ||||
| #include <stdint.h> | ||||
| #include "dsputil.h" | ||||
| 
 | ||||
| typedef struct WMV2DSPContext { | ||||
|     void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block); | ||||
|     void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); | ||||
| 
 | ||||
|     int idct_perm; | ||||
| } WMV2DSPContext; | ||||
| 
 | ||||
| void ff_wmv2dsp_init(WMV2DSPContext *c); | ||||
| 
 | ||||
| #endif /* AVCODEC_WMV2DSP_H */ | ||||
| @ -2,45 +2,45 @@ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st:-1 flags:0  ts:-1.000000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st:-1 flags:1  ts: 1.894167 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170 | ||||
| ret: 0         st: 0 flags:0  ts: 0.800000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989 | ||||
| ret:-1         st: 0 flags:1  ts:-0.320000 | ||||
| ret:-1         st:-1 flags:0  ts: 2.576668 | ||||
| ret: 0         st:-1 flags:1  ts: 1.470835 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170 | ||||
| ret: 0         st: 0 flags:0  ts: 0.360000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839 | ||||
| ret:-1         st: 0 flags:1  ts:-0.760000 | ||||
| ret:-1         st:-1 flags:0  ts: 2.153336 | ||||
| ret: 0         st:-1 flags:1  ts: 1.047503 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989 | ||||
| ret: 0         st: 0 flags:0  ts:-0.040000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st: 0 flags:1  ts: 2.840000 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554 | ||||
| ret: 0         st:-1 flags:0  ts: 1.730004 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554 | ||||
| ret: 0         st:-1 flags:1  ts: 0.624171 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839 | ||||
| ret: 0         st: 0 flags:0  ts:-0.480000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st: 0 flags:1  ts: 2.400000 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554 | ||||
| ret: 0         st:-1 flags:0  ts: 1.306672 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170 | ||||
| ret: 0         st:-1 flags:1  ts: 0.200839 | ||||
| ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st: 0 flags:0  ts:-0.920000 | ||||
| ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917 | ||||
| ret: 0         st: 0 flags:1  ts: 2.000000 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554 | ||||
| ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554 | ||||
| ret: 0         st:-1 flags:0  ts: 0.883340 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989 | ||||
| ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989 | ||||
| ret:-1         st:-1 flags:1  ts:-0.222493 | ||||
| ret:-1         st: 0 flags:0  ts: 2.680000 | ||||
| ret: 0         st: 0 flags:1  ts: 1.560000 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170 | ||||
| ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170 | ||||
| ret: 0         st:-1 flags:0  ts: 0.460008 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839 | ||||
| ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839 | ||||
| ret:-1         st:-1 flags:1  ts:-0.645825 | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| fc0796c6c49a18034cef008d61c0d964 *tests/data/fate/vsynth1-wmv2.avi | ||||
| 659840 tests/data/fate/vsynth1-wmv2.avi | ||||
| 5182edba5b5e0354b39ce4f3604b62da *tests/data/fate/vsynth1-wmv2.out.rawvideo | ||||
| stddev:    7.97 PSNR: 30.09 MAXDIFF:  110 bytes:  7603200/  7603200 | ||||
| 3c8a93fa645574f5b11eb51cf0efd227 *tests/data/fate/vsynth1-wmv2.avi | ||||
| 659162 tests/data/fate/vsynth1-wmv2.avi | ||||
| 2d61f24836d54766e8d370f243d83dcd *tests/data/fate/vsynth1-wmv2.out.rawvideo | ||||
| stddev:    7.97 PSNR: 30.09 MAXDIFF:  105 bytes:  7603200/  7603200 | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| 0760abea07c386ab956fa1bb8b14c599 *tests/data/fate/vsynth2-wmv2.avi | ||||
| c7db61ce6fc07e8fb9a7204992c2e4c4 *tests/data/fate/vsynth2-wmv2.avi | ||||
| 129848 tests/data/fate/vsynth2-wmv2.avi | ||||
| 81eee429b665254d19a06607463c0b5e *tests/data/fate/vsynth2-wmv2.out.rawvideo | ||||
| stddev:    5.33 PSNR: 33.60 MAXDIFF:   77 bytes:  7603200/  7603200 | ||||
| 288bdf1b411b814a067ceb00ac6b9d16 *tests/data/fate/vsynth2-wmv2.out.rawvideo | ||||
| stddev:    5.33 PSNR: 33.59 MAXDIFF:   77 bytes:  7603200/  7603200 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user