← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/mpeg4video.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mpeg4video.c
24
24
#include "mpeg4video.h"
25
25
#include "mpeg4data.h"
26
26
 
27
 
uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
 
27
uint8_t ff_mpeg4_static_rl_table_store[3][2][2 * MAX_RUN + MAX_LEVEL + 3];
28
28
 
29
 
int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s){
30
 
    switch(s->pict_type){
31
 
        case AV_PICTURE_TYPE_I:
32
 
            return 16;
33
 
        case AV_PICTURE_TYPE_P:
34
 
        case AV_PICTURE_TYPE_S:
35
 
            return s->f_code+15;
36
 
        case AV_PICTURE_TYPE_B:
37
 
            return FFMAX3(s->f_code, s->b_code, 2) + 15;
38
 
        default:
39
 
            return -1;
 
29
int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s)
 
30
{
 
31
    switch (s->pict_type) {
 
32
    case AV_PICTURE_TYPE_I:
 
33
        return 16;
 
34
    case AV_PICTURE_TYPE_P:
 
35
    case AV_PICTURE_TYPE_S:
 
36
        return s->f_code + 15;
 
37
    case AV_PICTURE_TYPE_B:
 
38
        return FFMAX3(s->f_code, s->b_code, 2) + 15;
 
39
    default:
 
40
        return -1;
40
41
    }
41
42
}
42
43
 
44
45
{
45
46
    int c_wrap, c_xy, l_wrap, l_xy;
46
47
 
47
 
    l_wrap= s->b8_stride;
48
 
    l_xy= (2*s->mb_y-1)*l_wrap + s->mb_x*2 - 1;
49
 
    c_wrap= s->mb_stride;
50
 
    c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1;
 
48
    l_wrap = s->b8_stride;
 
49
    l_xy   = (2 * s->mb_y - 1) * l_wrap + s->mb_x * 2 - 1;
 
50
    c_wrap = s->mb_stride;
 
51
    c_xy   = (s->mb_y - 1) * c_wrap + s->mb_x - 1;
51
52
 
52
53
#if 0
53
54
    /* clean DC */
54
 
    memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1);
55
 
    memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1);
56
 
    memsetw(s->dc_val[2] + c_xy, 1024, c_wrap+1);
 
55
    memsetw(s->dc_val[0] + l_xy, 1024, l_wrap * 2 + 1);
 
56
    memsetw(s->dc_val[1] + c_xy, 1024, c_wrap + 1);
 
57
    memsetw(s->dc_val[2] + c_xy, 1024, c_wrap + 1);
57
58
#endif
58
59
 
59
60
    /* clean AC */
60
 
    memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t));
61
 
    memset(s->ac_val[1] + c_xy, 0, (c_wrap  +1)*16*sizeof(int16_t));
62
 
    memset(s->ac_val[2] + c_xy, 0, (c_wrap  +1)*16*sizeof(int16_t));
 
61
    memset(s->ac_val[0] + l_xy, 0, (l_wrap * 2 + 1) * 16 * sizeof(int16_t));
 
62
    memset(s->ac_val[1] + c_xy, 0, (c_wrap     + 1) * 16 * sizeof(int16_t));
 
63
    memset(s->ac_val[2] + c_xy, 0, (c_wrap     + 1) * 16 * sizeof(int16_t));
63
64
 
64
65
    /* clean MV */
65
66
    // we can't clear the MVs as they might be needed by a b frame
66
 
//    memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t));
67
 
//    memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2));
68
 
    s->last_mv[0][0][0]=
69
 
    s->last_mv[0][0][1]=
70
 
    s->last_mv[1][0][0]=
71
 
    s->last_mv[1][0][1]= 0;
 
67
//    memset(s->motion_val + l_xy, 0, (l_wrap * 2 + 1) * 2 * sizeof(int16_t));
 
68
//    memset(s->motion_val, 0, 2 * sizeof(int16_t) * (2 + s->mb_width * 2) *
 
69
//           (2 + s->mb_height * 2));
 
70
    s->last_mv[0][0][0] =
 
71
    s->last_mv[0][0][1] =
 
72
    s->last_mv[1][0][0] =
 
73
    s->last_mv[1][0][1] = 0;
72
74
}
73
75
 
74
76
#define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0]))
75
 
#define tab_bias (tab_size/2)
 
77
#define tab_bias (tab_size / 2)
76
78
 
77
 
//used by mpeg4 and rv10 decoder
78
 
void ff_mpeg4_init_direct_mv(MpegEncContext *s){
 
79
// used by mpeg4 and rv10 decoder
 
80
void ff_mpeg4_init_direct_mv(MpegEncContext *s)
 
81
{
79
82
    int i;
80
 
    for(i=0; i<tab_size; i++){
81
 
        s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
82
 
        s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
 
83
    for (i = 0; i < tab_size; i++) {
 
84
        s->direct_scale_mv[0][i] = (i - tab_bias) * s->pb_time / s->pp_time;
 
85
        s->direct_scale_mv[1][i] = (i - tab_bias) * (s->pb_time - s->pp_time) /
 
86
                                   s->pp_time;
83
87
    }
84
88
}
85
89
 
86
 
static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
87
 
    int xy= s->block_index[i];
88
 
    uint16_t time_pp= s->pp_time;
89
 
    uint16_t time_pb= s->pb_time;
 
90
static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx,
 
91
                                              int my, int i)
 
92
{
 
93
    int xy           = s->block_index[i];
 
94
    uint16_t time_pp = s->pp_time;
 
95
    uint16_t time_pb = s->pb_time;
90
96
    int p_mx, p_my;
91
97
 
92
98
    p_mx = s->next_picture.motion_val[0][xy][0];
93
 
    if((unsigned)(p_mx + tab_bias) < tab_size){
 
99
    if ((unsigned)(p_mx + tab_bias) < tab_size) {
94
100
        s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx;
95
101
        s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
96
102
                            : s->direct_scale_mv[1][p_mx + tab_bias];
97
 
    }else{
98
 
        s->mv[0][i][0] = p_mx*time_pb/time_pp + mx;
 
103
    } else {
 
104
        s->mv[0][i][0] = p_mx * time_pb / time_pp + mx;
99
105
        s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
100
 
                            : p_mx*(time_pb - time_pp)/time_pp;
 
106
                            : p_mx * (time_pb - time_pp) / time_pp;
101
107
    }
102
108
    p_my = s->next_picture.motion_val[0][xy][1];
103
 
    if((unsigned)(p_my + tab_bias) < tab_size){
 
109
    if ((unsigned)(p_my + tab_bias) < tab_size) {
104
110
        s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my;
105
111
        s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
106
112
                            : s->direct_scale_mv[1][p_my + tab_bias];
107
 
    }else{
108
 
        s->mv[0][i][1] = p_my*time_pb/time_pp + my;
 
113
    } else {
 
114
        s->mv[0][i][1] = p_my * time_pb / time_pp + my;
109
115
        s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
110
 
                            : p_my*(time_pb - time_pp)/time_pp;
 
116
                            : p_my * (time_pb - time_pp) / time_pp;
111
117
    }
112
118
}
113
119
 
115
121
#undef tab_bias
116
122
 
117
123
/**
118
 
 *
119
124
 * @return the mb_type
120
125
 */
121
 
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my){
122
 
    const int mb_index= s->mb_x + s->mb_y*s->mb_stride;
 
126
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my)
 
127
{
 
128
    const int mb_index          = s->mb_x + s->mb_y * s->mb_stride;
123
129
    const int colocated_mb_type = s->next_picture.mb_type[mb_index];
124
130
    uint16_t time_pp;
125
131
    uint16_t time_pb;
126
132
    int i;
127
133
 
128
 
    //FIXME avoid divides
 
134
    // FIXME avoid divides
129
135
    // try special case with shifts for 1 and 3 B-frames?
130
136
 
131
 
    if(IS_8X8(colocated_mb_type)){
 
137
    if (IS_8X8(colocated_mb_type)) {
132
138
        s->mv_type = MV_TYPE_8X8;
133
 
        for(i=0; i<4; i++){
 
139
        for (i = 0; i < 4; i++)
134
140
            ff_mpeg4_set_one_direct_mv(s, mx, my, i);
135
 
        }
136
141
        return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1;
137
 
    } else if(IS_INTERLACED(colocated_mb_type)){
 
142
    } else if (IS_INTERLACED(colocated_mb_type)) {
138
143
        s->mv_type = MV_TYPE_FIELD;
139
 
        for(i=0; i<2; i++){
 
144
        for (i = 0; i < 2; i++) {
140
145
            int field_select = s->next_picture.ref_index[0][4 * mb_index + 2 * i];
141
 
            s->field_select[0][i]= field_select;
142
 
            s->field_select[1][i]= i;
143
 
            if(s->top_field_first){
144
 
                time_pp= s->pp_field_time - field_select + i;
145
 
                time_pb= s->pb_field_time - field_select + i;
146
 
            }else{
147
 
                time_pp= s->pp_field_time + field_select - i;
148
 
                time_pb= s->pb_field_time + field_select - i;
 
146
            s->field_select[0][i] = field_select;
 
147
            s->field_select[1][i] = i;
 
148
            if (s->top_field_first) {
 
149
                time_pp = s->pp_field_time - field_select + i;
 
150
                time_pb = s->pb_field_time - field_select + i;
 
151
            } else {
 
152
                time_pp = s->pp_field_time + field_select - i;
 
153
                time_pb = s->pb_field_time + field_select - i;
149
154
            }
150
 
            s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx;
151
 
            s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my;
152
 
            s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0]
153
 
                                : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp;
154
 
            s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1]
155
 
                                : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp;
 
155
            s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0] *
 
156
                             time_pb / time_pp + mx;
 
157
            s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1] *
 
158
                             time_pb / time_pp + my;
 
159
            s->mv[1][i][0] = mx ? s->mv[0][i][0] -
 
160
                                  s->p_field_mv_table[i][0][mb_index][0]
 
161
                                : s->p_field_mv_table[i][0][mb_index][0] *
 
162
                                  (time_pb - time_pp) / time_pp;
 
163
            s->mv[1][i][1] = my ? s->mv[0][i][1] -
 
164
                                  s->p_field_mv_table[i][0][mb_index][1]
 
165
                                : s->p_field_mv_table[i][0][mb_index][1] *
 
166
                                  (time_pb - time_pp) / time_pp;
156
167
        }
157
 
        return MB_TYPE_DIRECT2 | MB_TYPE_16x8 | MB_TYPE_L0L1 | MB_TYPE_INTERLACED;
158
 
    }else{
 
168
        return MB_TYPE_DIRECT2 | MB_TYPE_16x8 |
 
169
               MB_TYPE_L0L1    | MB_TYPE_INTERLACED;
 
170
    } else {
159
171
        ff_mpeg4_set_one_direct_mv(s, mx, my, 0);
160
 
        s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0];
161
 
        s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1];
162
 
        s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0];
163
 
        s->mv[1][1][1] = s->mv[1][2][1] = s->mv[1][3][1] = s->mv[1][0][1];
164
 
        if((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) || !s->quarter_sample)
165
 
            s->mv_type= MV_TYPE_16X16;
 
172
        s->mv[0][1][0] =
 
173
        s->mv[0][2][0] =
 
174
        s->mv[0][3][0] = s->mv[0][0][0];
 
175
        s->mv[0][1][1] =
 
176
        s->mv[0][2][1] =
 
177
        s->mv[0][3][1] = s->mv[0][0][1];
 
178
        s->mv[1][1][0] =
 
179
        s->mv[1][2][0] =
 
180
        s->mv[1][3][0] = s->mv[1][0][0];
 
181
        s->mv[1][1][1] =
 
182
        s->mv[1][2][1] =
 
183
        s->mv[1][3][1] = s->mv[1][0][1];
 
184
        if ((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) ||
 
185
            !s->quarter_sample)
 
186
            s->mv_type = MV_TYPE_16X16;
166
187
        else
167
 
            s->mv_type= MV_TYPE_8X8;
168
 
        return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line
 
188
            s->mv_type = MV_TYPE_8X8;
 
189
        // Note see prev line
 
190
        return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1;
169
191
    }
170
192
}