diff options
| -rw-r--r-- | src/video_dec/libmpeg2/header.c | 18 | ||||
| -rw-r--r-- | src/video_dec/libmpeg2/slice_xvmc.c | 14 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/video_dec/libmpeg2/header.c b/src/video_dec/libmpeg2/header.c index 0c2b76891..67cf63a6e 100644 --- a/src/video_dec/libmpeg2/header.c +++ b/src/video_dec/libmpeg2/header.c @@ -258,10 +258,10 @@ static int picture_coding_extension (picture_t * picture, uint8_t * buffer) static int sequence_display_extension (picture_t * picture, uint8_t * buffer) { /* FIXME: implement. */ uint32_t bit_position; - uint32_t padding; + /*uint32_t padding;*/ bit_position = 0; - padding = get_bits(buffer, 4, &bit_position); + /*padding = get_bits(buffer, 4, &bit_position);*/ bit_position += 4; picture->video_format = get_bits(buffer, 3, &bit_position); picture->colour_description = get_bits(buffer, 1, &bit_position); if(picture->colour_description) { @@ -270,7 +270,7 @@ static int sequence_display_extension (picture_t * picture, uint8_t * buffer) { picture->matrix_coefficients = get_bits(buffer, 8, &bit_position); } picture->display_horizontal_size = get_bits(buffer, 14, &bit_position); - padding = get_bits(buffer, 1, &bit_position); + /*padding = get_bits(buffer, 1, &bit_position);*/ bit_position++; picture->display_vertical_size = get_bits(buffer, 14, &bit_position); #ifdef LOG_PAN_SCAN @@ -291,18 +291,18 @@ static int sequence_display_extension (picture_t * picture, uint8_t * buffer) { static int picture_display_extension (picture_t * picture, uint8_t * buffer) { uint32_t bit_position; - uint32_t padding; + /*uint32_t padding;*/ #ifdef LOG_PAN_SCAN printf ("libmpeg2: picture_display_extension\n"); #endif bit_position = 0; - padding = get_bits(buffer, 4, &bit_position); + /*padding = get_bits(buffer, 4, &bit_position);*/ bit_position += 4; picture->frame_centre_horizontal_offset = get_bits_signed(buffer, 16, &bit_position); - padding = get_bits(buffer, 1, &bit_position); + /*padding = get_bits(buffer, 1, &bit_position);*/ bit_position++; picture->frame_centre_vertical_offset = get_bits_signed(buffer, 16, &bit_position); - padding = get_bits(buffer, 1, &bit_position); + /*padding = get_bits(buffer, 1, &bit_position);*/ bit_position++; #ifdef LOG_PAN_SCAN printf("Pan & Scan centre (x,y) = (%d, %d)\n", @@ -370,13 +370,13 @@ int mpeg2_header_extension (picture_t * picture, uint8_t * buffer) int mpeg2_header_group_of_pictures (picture_t * picture, uint8_t * buffer) { uint32_t bit_position; - uint32_t padding; + /*uint32_t padding;*/ bit_position = 0; picture->drop_frame_flag = get_bits(buffer, 1, &bit_position); picture->time_code_hours = get_bits(buffer, 5, &bit_position); picture->time_code_minutes = get_bits(buffer, 6, &bit_position); - padding = get_bits(buffer, 1, &bit_position); + /*padding = get_bits(buffer, 1, &bit_position);*/ bit_position++; picture->time_code_seconds = get_bits(buffer, 6, &bit_position); picture->time_code_pictures = get_bits(buffer, 6, &bit_position); picture->closed_gop = get_bits(buffer, 1, &bit_position); diff --git a/src/video_dec/libmpeg2/slice_xvmc.c b/src/video_dec/libmpeg2/slice_xvmc.c index 014ae7924..b46886b3a 100644 --- a/src/video_dec/libmpeg2/slice_xvmc.c +++ b/src/video_dec/libmpeg2/slice_xvmc.c @@ -1252,6 +1252,7 @@ static void motion_fr_dmv (picture_t * picture, motion_t * motion, #undef bit_ptr } +#if 0 static void motion_reuse (picture_t * picture, motion_t * motion, void (** table) (uint8_t *, uint8_t *, int, int)) { @@ -1261,6 +1262,7 @@ static void motion_reuse (picture_t * picture, motion_t * motion, motion_y = motion->pmv[0][1]; } +#endif /* like motion_frame, but parsing without actual motion compensation */ static void motion_fr_conceal (picture_t * picture) @@ -1295,10 +1297,10 @@ static void motion_fi_field (picture_t * picture, motion_t * motion, #define bits (picture->bitstream_bits) #define bit_ptr (picture->bitstream_ptr) int motion_x, motion_y; - uint8_t ** ref_field; + /*uint8_t ** ref_field;*/ NEEDBITS (bit_buf, bits, bit_ptr); - ref_field = motion->ref2[UBITS (bit_buf, 1)]; + /*ref_field = motion->ref2[UBITS (bit_buf, 1)];*/ // TODO field select may need to do something here for bob (weave ok) picture->XvMC_mv_field_sel[0][0] = picture->XvMC_mv_field_sel[1][0] = 0; @@ -1328,10 +1330,10 @@ static void motion_fi_16x8 (picture_t * picture, motion_t * motion, #define bits (picture->bitstream_bits) #define bit_ptr (picture->bitstream_ptr) int motion_x, motion_y; - uint8_t ** ref_field; + /*uint8_t ** ref_field;*/ NEEDBITS (bit_buf, bits, bit_ptr); - ref_field = motion->ref2[UBITS (bit_buf, 1)]; + /*ref_field = motion->ref2[UBITS (bit_buf, 1)];*/ // TODO field select may need to do something here bob (weave ok) picture->XvMC_mv_field_sel[0][0] = picture->XvMC_mv_field_sel[1][0] = 0; @@ -1351,7 +1353,7 @@ static void motion_fi_16x8 (picture_t * picture, motion_t * motion, NEEDBITS (bit_buf, bits, bit_ptr); - ref_field = motion->ref2[UBITS (bit_buf, 1)]; + /*ref_field = motion->ref2[UBITS (bit_buf, 1)];*/ // TODO field select may need to do something here for bob (weave ok) picture->XvMC_mv_field_sel[0][0] = picture->XvMC_mv_field_sel[1][0] = 0; @@ -1973,7 +1975,7 @@ void mpeg2_xvmc_slice (mpeg2dec_accel_t *accel, picture_t * picture, int code, u picture->f_motion.pmv, picture->b_motion.pmv); } else { - MOTION_CALL (motion_reuse, macroblock_modes); + //MOTION_CALL (motion_reuse, macroblock_modes); } NEXT_MACROBLOCK; } while (--mba_inc); |