diff options
| author | Robin KAY <komadori@users.sourceforge.net> | 2003-10-22 20:38:09 +0000 |
|---|---|---|
| committer | Robin KAY <komadori@users.sourceforge.net> | 2003-10-22 20:38:09 +0000 |
| commit | 51616b96cd2793085ae314fecde90ac9a0735a04 (patch) | |
| tree | 0b39e50ada1882338f37d0225729a201c755e61c /src/libmpeg2/slice.c | |
| parent | 35decc993a98b994662fcdca0fc537398d64a03d (diff) | |
| download | xine-lib-51616b96cd2793085ae314fecde90ac9a0735a04.tar.gz xine-lib-51616b96cd2793085ae314fecde90ac9a0735a04.tar.bz2 | |
Replace copy member in vo_frame_t with proc_frame and proc_slice. Increase video_out API version to 18.
CVS patchset: 5574
CVS date: 2003/10/22 20:38:09
Diffstat (limited to 'src/libmpeg2/slice.c')
| -rw-r--r-- | src/libmpeg2/slice.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/libmpeg2/slice.c b/src/libmpeg2/slice.c index 0d2fed055..0fe4ee2d9 100644 --- a/src/libmpeg2/slice.c +++ b/src/libmpeg2/slice.c @@ -1438,27 +1438,27 @@ do { \ mpeg2_mc.avg : mpeg2_mc.put)); \ } while (0) -#define NEXT_MACROBLOCK \ -do { \ - picture->offset += 16; \ - if (picture->offset == picture->coded_picture_width) { \ - do { /* just so we can use the break statement */ \ - if (picture->current_frame->copy) { \ - picture->current_frame->copy (picture->current_frame, \ - picture->dest); \ - } \ - picture->dest[0] += 16 * picture->pitches[0]; \ - picture->dest[1] += 8 * picture->pitches[1]; \ - picture->dest[2] += 8 * picture->pitches[2]; \ - } while (0); \ - picture->v_offset += 16; \ - if (picture->v_offset > picture->limit_y) { \ - if (mpeg2_cpu_state_restore) \ - mpeg2_cpu_state_restore (&cpu_state); \ - return; \ - } \ - picture->offset = 0; \ - } \ +#define NEXT_MACROBLOCK \ +do { \ + picture->offset += 16; \ + if (picture->offset == picture->coded_picture_width) { \ + do { /* just so we can use the break statement */ \ + if (picture->current_frame->proc_slice) { \ + picture->current_frame->proc_slice (picture->current_frame, \ + picture->dest); \ + } \ + picture->dest[0] += 16 * picture->pitches[0]; \ + picture->dest[1] += 8 * picture->pitches[1]; \ + picture->dest[2] += 8 * picture->pitches[2]; \ + } while (0); \ + picture->v_offset += 16; \ + if (picture->v_offset > picture->limit_y) { \ + if (mpeg2_cpu_state_restore) \ + mpeg2_cpu_state_restore (&cpu_state); \ + return; \ + } \ + picture->offset = 0; \ + } \ } while (0) static inline int slice_init (picture_t * picture, int code) @@ -1605,7 +1605,7 @@ static inline int slice_init (picture_t * picture, int code) while (picture->offset - picture->coded_picture_width >= 0) { picture->offset -= picture->coded_picture_width; - if ((picture->current_frame->copy == NULL) || + if ((picture->current_frame->proc_slice == NULL) || (picture->picture_coding_type != B_TYPE)) { picture->dest[0] += 16 * picture->pitches[0]; picture->dest[1] += 8 * picture->pitches[1]; |