Mercurial > mplayer.hg
view libmpeg2/libmpeg-0.4.0.diff @ 13395:07708ec98d87
New MD5 sum video output driver. For every frame, it calculates the MD5 sum
and writes a list of those sums to an, optionally specified, output file.
It does not rely on external programs to be installed. The MD5 sum code is
borrowed from the uCIFS library, written by Christopher R. Hertel in 2004
and released under the LGPL license.
Note: This driver is not yet activated and will not be compiled and linked
to libvo. A separate patch will take care of that. This is just for adding
the files to the repository.
author | ivo |
---|---|
date | Mon, 20 Sep 2004 01:01:08 +0000 |
parents | 456a348bd973 |
children | 96259a2f2142 |
line wrap: on
line source
diff -ur libmpeg2/attributes.h libmpeg2/attributes.h --- libmpeg2/attributes.h 2003-01-09 08:48:40.000000000 +0100 +++ libmpeg2/attributes.h 2004-08-25 20:59:47.000000000 +0200 @@ -25,7 +25,7 @@ #ifdef ATTRIBUTE_ALIGNED_MAX #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) #else -#define ATTR_ALIGN(align) +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((16 < align) ? 16 : align))) #endif #ifdef HAVE_BUILTIN_EXPECT diff -ur libmpeg2/cpu_accel.c libmpeg2/cpu_accel.c --- libmpeg2/cpu_accel.c 2003-10-06 04:31:52.000000000 +0200 +++ libmpeg2/cpu_accel.c 2004-08-15 15:37:41.000000000 +0200 @@ -108,7 +108,7 @@ } #endif /* ARCH_X86 */ -#if defined(ARCH_PPC) || defined(ARCH_SPARC) +#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS)) #include <signal.h> #include <setjmp.h> @@ -195,6 +195,7 @@ #ifdef ARCH_ALPHA static inline uint32_t arch_accel (void) { +#ifdef CAN_COMPILE_ALPHA_MVI uint64_t no_mvi; asm volatile ("amask %1, %0" @@ -202,6 +203,9 @@ : "rI" (256)); /* AMASK_MVI */ return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA | MPEG2_ACCEL_ALPHA_MVI); +#else + return MPEG2_ACCEL_ALPHA; +#endif } #endif /* ARCH_ALPHA */ #endif /* ACCEL_DETECT */ diff -ur libmpeg2/cpu_state.c libmpeg2/cpu_state.c --- libmpeg2/cpu_state.c 2003-08-21 10:00:49.000000000 +0200 +++ libmpeg2/cpu_state.c 2004-08-02 13:27:37.000000000 +0200 @@ -120,7 +120,7 @@ mpeg2_cpu_state_restore = state_restore_mmx; } #endif -#ifdef ARCH_PPC +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { mpeg2_cpu_state_save = state_save_altivec; mpeg2_cpu_state_restore = state_restore_altivec; diff -ur libmpeg2/decode.c libmpeg2/decode.c --- libmpeg2/decode.c 2003-12-22 12:59:34.000000000 +0100 +++ libmpeg2/decode.c 2004-08-02 13:27:37.000000000 +0200 @@ -351,6 +351,15 @@ fbuf->buf[1] = buf[1]; fbuf->buf[2] = buf[2]; fbuf->id = id; + // HACK! FIXME! At first I frame, copy pointers to prediction frame too! + if (mpeg2dec->custom_fbuf && !mpeg2dec->fbuf[1]->buf[0]){ + mpeg2dec->fbuf[1]->buf[0]=buf[0]; + mpeg2dec->fbuf[1]->buf[1]=buf[1]; + mpeg2dec->fbuf[1]->buf[2]=buf[2]; + mpeg2dec->fbuf[1]->id=NULL; + } +// printf("libmpeg2: FBUF 0:%p 1:%p 2:%p\n", +// mpeg2dec->fbuf[0]->buf[0],mpeg2dec->fbuf[1]->buf[0],mpeg2dec->fbuf[2]->buf[0]); } void mpeg2_custom_fbuf (mpeg2dec_t * mpeg2dec, int custom_fbuf) diff -ur libmpeg2/header.c libmpeg2/header.c --- libmpeg2/header.c 2003-12-22 12:24:02.000000000 +0100 +++ libmpeg2/header.c 2004-08-24 22:25:07.000000000 +0200 @@ -100,6 +100,9 @@ mpeg2dec->decoder.convert = NULL; mpeg2dec->decoder.convert_id = NULL; mpeg2dec->picture = mpeg2dec->pictures; + memset(&mpeg2dec->fbuf_alloc[0].fbuf, 0, sizeof(mpeg2_fbuf_t)); + memset(&mpeg2dec->fbuf_alloc[1].fbuf, 0, sizeof(mpeg2_fbuf_t)); + memset(&mpeg2dec->fbuf_alloc[2].fbuf, 0, sizeof(mpeg2_fbuf_t)); mpeg2dec->fbuf[0] = &mpeg2dec->fbuf_alloc[0].fbuf; mpeg2dec->fbuf[1] = &mpeg2dec->fbuf_alloc[1].fbuf; mpeg2dec->fbuf[2] = &mpeg2dec->fbuf_alloc[2].fbuf; @@ -551,6 +554,7 @@ if (!(mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE)) { picture->nb_fields = (buffer[3] & 2) ? 3 : 2; flags |= (buffer[3] & 128) ? PIC_FLAG_TOP_FIELD_FIRST : 0; + flags |= (buffer[3] & 2) ? PIC_FLAG_REPEAT_FIRST_FIELD : 0; } else picture->nb_fields = (buffer[3]&2) ? ((buffer[3]&128) ? 6 : 4) : 2; break; @@ -799,6 +803,7 @@ mpeg2dec->scaled[index] = mpeg2dec->q_scale_type; for (i = 0; i < 32; i++) { k = mpeg2dec->q_scale_type ? non_linear_scale[i] : (i << 1); + decoder->quantizer_scales[i] = k; for (j = 0; j < 64; j++) decoder->quantizer_prescale[index][i][j] = k * mpeg2dec->quantizer_matrix[index][j]; diff -ur libmpeg2/idct_alpha.c libmpeg2/idct_alpha.c --- libmpeg2/idct_alpha.c 2003-09-19 11:26:42.000000000 +0200 +++ libmpeg2/idct_alpha.c 2004-08-02 13:27:37.000000000 +0200 @@ -59,7 +59,7 @@ } while (0) #endif -static void inline idct_row (int16_t * const block) +static inline void idct_row (int16_t * const block) { uint64_t l, r; int_fast32_t d0, d1, d2, d3; @@ -116,7 +116,7 @@ block[7] = (a0 - b0) >> 12; } -static void inline idct_col (int16_t * const block) +static inline void idct_col (int16_t * const block) { int_fast32_t d0, d1, d2, d3; int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3; @@ -157,6 +157,7 @@ block[8*7] = (a0 - b0) >> 17; } +#ifdef CAN_COMPILE_ALPHA_MVI void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride) { uint64_t clampmask; @@ -289,6 +290,7 @@ stq (p7, dest + 7 * stride); } } +#endif void mpeg2_idct_copy_alpha (int16_t * block, uint8_t * dest, const int stride) { diff -ur libmpeg2/idct.c libmpeg2/idct.c --- libmpeg2/idct.c 2003-09-19 11:26:42.000000000 +0200 +++ libmpeg2/idct.c 2004-08-02 13:27:37.000000000 +0200 @@ -66,7 +66,7 @@ } while (0) #endif -static void inline idct_row (int16_t * const block) +static inline void idct_row (int16_t * const block) { int d0, d1, d2, d3; int a0, a1, a2, a3, b0, b1, b2, b3; @@ -119,7 +119,7 @@ block[7] = (a0 - b0) >> 12; } -static void inline idct_col (int16_t * const block) +static inline void idct_col (int16_t * const block) { int d0, d1, d2, d3; int a0, a1, a2, a3, b0, b1, b2, b3; @@ -254,11 +254,14 @@ } else #endif #ifdef ARCH_ALPHA +#ifdef CAN_COMPILE_ALPHA_MVI if (accel & MPEG2_ACCEL_ALPHA_MVI) { mpeg2_idct_copy = mpeg2_idct_copy_mvi; mpeg2_idct_add = mpeg2_idct_add_mvi; mpeg2_idct_alpha_init (); - } else if (accel & MPEG2_ACCEL_ALPHA) { + } else +#endif + if (accel & MPEG2_ACCEL_ALPHA) { int i; mpeg2_idct_copy = mpeg2_idct_copy_alpha; diff -ur libmpeg2/motion_comp.c libmpeg2/motion_comp.c --- libmpeg2/motion_comp.c 2003-10-06 04:31:52.000000000 +0200 +++ libmpeg2/motion_comp.c 2004-08-15 15:37:41.000000000 +0200 @@ -43,20 +43,24 @@ else #endif #ifdef ARCH_PPC +#ifdef HAVE_ALTIVEC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) mpeg2_mc = mpeg2_mc_altivec; else #endif +#endif #ifdef ARCH_ALPHA if (accel & MPEG2_ACCEL_ALPHA) mpeg2_mc = mpeg2_mc_alpha; else #endif #ifdef ARCH_SPARC +#ifdef HAVE_VIS if (accel & MPEG2_ACCEL_SPARC_VIS) mpeg2_mc = mpeg2_mc_vis; else #endif +#endif mpeg2_mc = mpeg2_mc_c; } diff -ur libmpeg2/mpeg2.h libmpeg2/mpeg2.h --- libmpeg2/mpeg2.h 2003-12-22 13:13:35.000000000 +0100 +++ libmpeg2/mpeg2.h 2004-08-02 13:27:37.000000000 +0200 @@ -82,6 +82,7 @@ #define PIC_FLAG_COMPOSITE_DISPLAY 32 #define PIC_FLAG_SKIP 64 #define PIC_FLAG_TAGS 128 +#define PIC_FLAG_REPEAT_FIRST_FIELD 256 #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000 typedef struct mpeg2_picture_s { diff -ur libmpeg2/mpeg2_internal.h libmpeg2/mpeg2_internal.h --- libmpeg2/mpeg2_internal.h 2003-12-22 12:24:02.000000000 +0100 +++ libmpeg2/mpeg2_internal.h 2004-08-24 22:25:07.000000000 +0200 @@ -144,6 +144,12 @@ int second_field; int mpeg1; + + /* for MPlayer: */ + int quantizer_scales[32]; + int quantizer_scale; + char* quant_store; + int quant_stride; }; typedef struct { @@ -214,6 +220,10 @@ int8_t q_scale_type, scaled[4]; uint8_t quantizer_matrix[4][64]; uint8_t new_quantizer_matrix[4][64]; + + /* for MPlayer: */ + unsigned char *pending_buffer; + int pending_length; }; typedef struct { diff -ur libmpeg2/slice.c libmpeg2/slice.c --- libmpeg2/slice.c 2003-12-22 12:24:02.000000000 +0100 +++ libmpeg2/slice.c 2004-08-24 22:25:07.000000000 +0200 @@ -142,6 +142,7 @@ quantizer_scale_code = UBITS (bit_buf, 5); DUMPBITS (bit_buf, bits, 5); + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code]; decoder->quantizer_matrix[0] = decoder->quantizer_prescale[0][quantizer_scale_code]; @@ -1564,6 +1565,9 @@ #define NEXT_MACROBLOCK \ do { \ + if(decoder->quant_store) \ + decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \ + +(decoder->offset>>4)] = decoder->quantizer_scale; \ decoder->offset += 16; \ if (decoder->offset == decoder->width) { \ do { /* just so we can use the break statement */ \