virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

svq3: move the frame num variables to the SVQ3Context

Browse Source
This commit is contained in:
Anton Khirnov
2016-03-23 11:04:59 +01:00
parent 21b7469322
commit ea6ab02a17
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/svq3.c
View File

@@ -93,6 +93,10 @@ typedef struct SVQ3Context {
int slice_num; int slice_num;
int qscale; int qscale;
int cbp; int cbp;
int frame_num;
int frame_num_offset;
int prev_frame_num_offset;
int prev_frame_num;
enum AVPictureType pict_type; enum AVPictureType pict_type;
@@ -503,15 +507,15 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode,
my = s->next_pic->motion_val[0][b_xy][1] << 1; my = s->next_pic->motion_val[0][b_xy][1] << 1;
if (dir == 0) { if (dir == 0) {
mx = mx * h->frame_num_offset / mx = mx * s->frame_num_offset /
h->prev_frame_num_offset + 1 >> 1; s->prev_frame_num_offset + 1 >> 1;
my = my * h->frame_num_offset / my = my * s->frame_num_offset /
h->prev_frame_num_offset + 1 >> 1; s->prev_frame_num_offset + 1 >> 1;
} else { } else {
mx = mx * (h->frame_num_offset - h->prev_frame_num_offset) / mx = mx * (s->frame_num_offset - s->prev_frame_num_offset) /
h->prev_frame_num_offset + 1 >> 1; s->prev_frame_num_offset + 1 >> 1;
my = my * (h->frame_num_offset - h->prev_frame_num_offset) / my = my * (s->frame_num_offset - s->prev_frame_num_offset) /
h->prev_frame_num_offset + 1 >> 1; s->prev_frame_num_offset + 1 >> 1;
} }
} }
@@ -1470,22 +1474,22 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
} }
if (s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_B) {
h->frame_num_offset = s->slice_num - h->prev_frame_num; s->frame_num_offset = s->slice_num - s->prev_frame_num;
if (h->frame_num_offset < 0) if (s->frame_num_offset < 0)
h->frame_num_offset += 256; s->frame_num_offset += 256;
if (h->frame_num_offset == 0 || if (s->frame_num_offset == 0 ||
h->frame_num_offset >= h->prev_frame_num_offset) { s->frame_num_offset >= s->prev_frame_num_offset) {
av_log(h->avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); av_log(h->avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
return -1; return -1;
} }
} else { } else {
h->prev_frame_num = h->frame_num; s->prev_frame_num = s->frame_num;
h->frame_num = s->slice_num; s->frame_num = s->slice_num;
h->prev_frame_num_offset = h->frame_num - h->prev_frame_num; s->prev_frame_num_offset = s->frame_num - s->prev_frame_num;
if (h->prev_frame_num_offset < 0) if (s->prev_frame_num_offset < 0)
h->prev_frame_num_offset += 256; s->prev_frame_num_offset += 256;
} }
for (m = 0; m < 2; m++) { for (m = 0; m < 2; m++) {