Mercurial > libavcodec.hg
annotate h264_direct.c @ 11108:0f845e20982a libavcodec
ARMv6 optimised put_pixels functions except xy2 variants
author | mru |
---|---|
date | Tue, 09 Feb 2010 16:13:21 +0000 |
parents | f85c5cb2c402 |
children | a0c52e951a29 |
rev | line source |
---|---|
1168 | 1 /* |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
2 * H.26L/H.264/AVC/JVT/14496-10/... direct mb/block decoding |
1168 | 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
1168 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
1168 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
1168 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3927
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3029
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1168 | 20 */ |
2967 | 21 |
1168 | 22 /** |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
23 * @file libavcodec/h264_direct.c |
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
24 * H.264 / AVC / MPEG4 part10 direct mb/block decoding. |
1168 | 25 * @author Michael Niedermayer <michaelni@gmx.at> |
26 */ | |
27 | |
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
9004
diff
changeset
|
28 #include "internal.h" |
1168 | 29 #include "dsputil.h" |
30 #include "avcodec.h" | |
31 #include "mpegvideo.h" | |
4975 | 32 #include "h264.h" |
6020 | 33 #include "rectangle.h" |
1168 | 34 |
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3219
diff
changeset
|
35 //#undef NDEBUG |
1168 | 36 #include <assert.h> |
37 | |
38 | |
7898
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
39 static int get_scale_factor(H264Context * const h, int poc, int poc1, int i){ |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
40 int poc0 = h->ref_list[0][i].poc; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
41 int td = av_clip(poc1 - poc0, -128, 127); |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
42 if(td == 0 || h->ref_list[0][i].long_ref){ |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
43 return 256; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
44 }else{ |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
45 int tb = av_clip(poc - poc0, -128, 127); |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
46 int tx = (16384 + (FFABS(td) >> 1)) / td; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
47 return av_clip((tb*tx + 32) >> 6, -1024, 1023); |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
48 } |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
49 } |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
50 |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
51 void ff_h264_direct_dist_scale_factor(H264Context * const h){ |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
52 MpegEncContext * const s = &h->s; |
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
53 const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ]; |
2396 | 54 const int poc1 = h->ref_list[1][0].poc; |
7898
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
55 int i, field; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
56 for(field=0; field<2; field++){ |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
57 const int poc = h->s.current_picture_ptr->field_poc[field]; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
58 const int poc1 = h->ref_list[1][0].field_poc[field]; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
59 for(i=0; i < 2*h->ref_count[0]; i++) |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
60 h->dist_scale_factor_field[field][i^field] = get_scale_factor(h, poc, poc1, i+16); |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
61 } |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
62 |
2396 | 63 for(i=0; i<h->ref_count[0]; i++){ |
7898
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
64 h->dist_scale_factor[i] = get_scale_factor(h, poc, poc1, i); |
3316 | 65 } |
2396 | 66 } |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
67 |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
68 static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){ |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
69 MpegEncContext * const s = &h->s; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
70 Picture * const ref1 = &h->ref_list[1][0]; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
71 int j, old_ref, rfield; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
72 int start= mbafi ? 16 : 0; |
11086 | 73 int end = mbafi ? 16+2*h->ref_count[0] : h->ref_count[0]; |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
74 int interl= mbafi || s->picture_structure != PICT_FRAME; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
75 |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
76 /* bogus; fills in for missing frames */ |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
77 memset(map[list], 0, sizeof(map[list])); |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
78 |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
79 for(rfield=0; rfield<2; rfield++){ |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
80 for(old_ref=0; old_ref<ref1->ref_count[colfield][list]; old_ref++){ |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
81 int poc = ref1->ref_poc[colfield][list][old_ref]; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
82 |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
83 if (!interl) |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
84 poc |= 3; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
85 else if( interl && (poc&3) == 3) //FIXME store all MBAFF references so this isnt needed |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
86 poc= (poc&~3) + rfield + 1; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
87 |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
88 for(j=start; j<end; j++){ |
11086 | 89 if(4*h->ref_list[0][j].frame_num + (h->ref_list[0][j].reference&3) == poc){ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
90 int cur_ref= mbafi ? (j-16)^field : j; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
91 map[list][2*old_ref + (rfield^field) + 16] = cur_ref; |
11086 | 92 if(rfield == field || !interl) |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
93 map[list][old_ref] = cur_ref; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
94 break; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
95 } |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
96 } |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
97 } |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
98 } |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
99 } |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
100 |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
101 void ff_h264_direct_ref_list_init(H264Context * const h){ |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
102 MpegEncContext * const s = &h->s; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
103 Picture * const ref1 = &h->ref_list[1][0]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
104 Picture * const cur = s->current_picture_ptr; |
7928 | 105 int list, j, field; |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
106 int sidx= (s->picture_structure&1)^1; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
107 int ref1sidx= (ref1->reference&1)^1; |
7907 | 108 |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
109 for(list=0; list<2; list++){ |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
110 cur->ref_count[sidx][list] = h->ref_count[list]; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
111 for(j=0; j<h->ref_count[list]; j++) |
7487
13937730e79d
Use frame_num and reference instead of poc for matching frames for direct
michael
parents:
7486
diff
changeset
|
112 cur->ref_poc[sidx][list][j] = 4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3); |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
113 } |
7907 | 114 |
7482 | 115 if(s->picture_structure == PICT_FRAME){ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
116 memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0])); |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
117 memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0])); |
7482 | 118 } |
7907 | 119 |
7902
8b8be8f2b647
Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents:
7901
diff
changeset
|
120 cur->mbaff= FRAME_MBAFF; |
7907 | 121 |
11093
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
122 h->col_fieldoff= 0; |
11085
27b5a2bd1dfe
Fix reference selection for colocated MBs from frames to fields.
michael
parents:
11084
diff
changeset
|
123 if(s->picture_structure == PICT_FRAME){ |
27b5a2bd1dfe
Fix reference selection for colocated MBs from frames to fields.
michael
parents:
11084
diff
changeset
|
124 int cur_poc = s->current_picture_ptr->poc; |
27b5a2bd1dfe
Fix reference selection for colocated MBs from frames to fields.
michael
parents:
11084
diff
changeset
|
125 int *col_poc = h->ref_list[1]->field_poc; |
11093
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
126 h->col_parity= (FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc)); |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
127 ref1sidx=sidx= h->col_parity; |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
128 }else if(!(s->picture_structure & h->ref_list[1][0].reference) && !h->ref_list[1][0].mbaff){ // FL -> FL & differ parity |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
129 h->col_fieldoff= s->mb_stride*(2*(h->ref_list[1][0].reference) - 3); |
11085
27b5a2bd1dfe
Fix reference selection for colocated MBs from frames to fields.
michael
parents:
11084
diff
changeset
|
130 } |
27b5a2bd1dfe
Fix reference selection for colocated MBs from frames to fields.
michael
parents:
11084
diff
changeset
|
131 |
11093
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
132 if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred) |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
133 return; |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
134 |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
135 for(list=0; list<2; list++){ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
136 fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0); |
11088
1bfb70c225bb
Skip the fill_colmap() case thats for MBAFF if we dont have an MBAFF frame.
michael
parents:
11086
diff
changeset
|
137 if(FRAME_MBAFF) |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
138 for(field=0; field<2; field++) |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
139 fill_colmap(h, h->map_col_to_list0_field[field], list, field, field, 1); |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
140 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
141 } |
2396 | 142 |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
143 void ff_h264_pred_direct_motion(H264Context * const h, int *mb_type){ |
2396 | 144 MpegEncContext * const s = &h->s; |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
145 int b8_stride = h->b8_stride; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
146 int b4_stride = h->b_stride; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
147 int mb_xy = h->mb_xy; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
148 int mb_type_col[2]; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
149 const int16_t (*l1mv0)[2], (*l1mv1)[2]; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
150 const int8_t *l1ref0, *l1ref1; |
2396 | 151 const int is_b8x8 = IS_8X8(*mb_type); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
152 unsigned int sub_mb_type; |
2396 | 153 int i8, i4; |
154 | |
9416
d863de897b41
Assert that the first list1 entry is a reference frame.
michael
parents:
9415
diff
changeset
|
155 assert(h->ref_list[1][0].reference&3); |
d863de897b41
Assert that the first list1 entry is a reference frame.
michael
parents:
9415
diff
changeset
|
156 |
3316 | 157 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
158 |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
159 if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL |
7900 | 160 if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL |
11093
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
161 mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride; |
7901 | 162 b8_stride = 0; |
11093
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
163 }else{ |
788db3371366
Precalculate a few variables for direct mv prediction for interlaced MBs.
michael
parents:
11092
diff
changeset
|
164 mb_xy += h->col_fieldoff; // non zero for FL -> FL & differ parity |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
165 } |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
166 goto single_col; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
167 }else{ // AFL/AFR/FR/FL -> AFR/FR |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
168 if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
169 mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
170 mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy]; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
171 mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + s->mb_stride]; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
172 b8_stride *= 3; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
173 b4_stride *= 6; |
11090
eda7b4f6db51
Remove FIXMEs for cases that are disallowed by the spec.
michael
parents:
11088
diff
changeset
|
174 |
11091 | 175 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
176 if( (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA) |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
177 && (mb_type_col[1] & MB_TYPE_16x16_OR_INTRA) |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
178 && !is_b8x8){ |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
179 *mb_type |= MB_TYPE_16x8 |MB_TYPE_L0L1|MB_TYPE_DIRECT2; /* B_16x8 */ |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
180 }else{ |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
181 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1; |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
182 } |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
183 }else{ // AFR/FR -> AFR/FR |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
184 single_col: |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
185 mb_type_col[0] = |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
186 mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy]; |
11106
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
187 |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
188 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
189 if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){ |
7494 | 190 *mb_type |= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ |
11092
64c36264b13f
Set direct MB partitioning for 16x8 and 8x16 colocated MBs to the respective true partitioning.
michael
parents:
11091
diff
changeset
|
191 }else if(!is_b8x8 && (mb_type_col[0] & (MB_TYPE_16x8|MB_TYPE_8x16))){ |
64c36264b13f
Set direct MB partitioning for 16x8 and 8x16 colocated MBs to the respective true partitioning.
michael
parents:
11091
diff
changeset
|
192 *mb_type |= MB_TYPE_L0L1|MB_TYPE_DIRECT2 | (mb_type_col[0] & (MB_TYPE_16x8|MB_TYPE_8x16)); |
7494 | 193 }else{ |
11106
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
194 if(!h->sps.direct_8x8_inference_flag){ |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
195 /* FIXME save sub mb types from previous frames (or derive from MVs) |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
196 * so we know exactly what block size to use */ |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
197 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ |
f85c5cb2c402
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
michael
parents:
11105
diff
changeset
|
198 } |
7494 | 199 *mb_type |= MB_TYPE_8x8|MB_TYPE_L0L1; |
200 } | |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
201 } |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
202 } |
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
203 |
7497 | 204 l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]]; |
205 l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]]; | |
206 l1ref0 = &h->ref_list[1][0].ref_index [0][h->mb2b8_xy[mb_xy]]; | |
207 l1ref1 = &h->ref_list[1][0].ref_index [1][h->mb2b8_xy[mb_xy]]; | |
7496 | 208 if(!b8_stride){ |
209 if(s->mb_y&1){ | |
210 l1ref0 += h->b8_stride; | |
211 l1ref1 += h->b8_stride; | |
212 l1mv0 += 2*b4_stride; | |
213 l1mv1 += 2*b4_stride; | |
214 } | |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
215 } |
2967 | 216 |
2396 | 217 if(h->direct_spatial_mv_pred){ |
218 int ref[2]; | |
219 int mv[2][2]; | |
220 int list; | |
221 | |
222 /* ref = min(neighbors) */ | |
223 for(list=0; list<2; list++){ | |
11099
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
224 int left_ref = h->ref_cache[list][scan8[0] - 1]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
225 int top_ref = h->ref_cache[list][scan8[0] - 8]; |
2396 | 226 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; |
11099
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
227 const int16_t *C= h->mv_cache[list][ scan8[0] - 8 + 4]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
228 if(refc == PART_NOT_AVAILABLE){ |
2396 | 229 refc = h->ref_cache[list][scan8[0] - 8 - 1]; |
11099
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
230 C = h-> mv_cache[list][scan8[0] - 8 - 1]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
231 } |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
232 ref[list] = FFMIN3((unsigned)left_ref, (unsigned)top_ref, (unsigned)refc); |
11094
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
233 if(ref[list] >= 0){ |
11099
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
234 //this is just pred_motion() but with the cases removed that cannot happen for direct blocks |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
235 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
236 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
237 |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
238 int match_count= (left_ref==ref[list]) + (top_ref==ref[list]) + (refc==ref[list]); |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
239 if(match_count > 1){ //most common |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
240 mv[list][0]= mid_pred(A[0], B[0], C[0]); |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
241 mv[list][1]= mid_pred(A[1], B[1], C[1]); |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
242 }else { |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
243 assert(match_count==1); |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
244 if(left_ref==ref[list]){ |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
245 mv[list][0]= A[0]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
246 mv[list][1]= A[1]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
247 }else if(top_ref==ref[list]){ |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
248 mv[list][0]= B[0]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
249 mv[list][1]= B[1]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
250 }else{ |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
251 mv[list][0]= C[0]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
252 mv[list][1]= C[1]; |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
253 } |
8023ba45995f
Replace call to pred_motion() in direct spatial mv pred by code
michael
parents:
11097
diff
changeset
|
254 } |
11094
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
255 }else{ |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
256 int mask= ~(MB_TYPE_L0 << (2*list)); |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
257 mv[list][0] = mv[list][1] = 0; |
2396 | 258 ref[list] = -1; |
11094
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
259 if(!is_b8x8) |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
260 *mb_type &= mask; |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
261 sub_mb_type &= mask; |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
262 } |
2396 | 263 } |
264 if(ref[0] < 0 && ref[1] < 0){ | |
265 ref[0] = ref[1] = 0; | |
6309 | 266 if(!is_b8x8) |
11094
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
267 *mb_type |= MB_TYPE_L0L1; |
323491bb995c
Merge mv&ref related code for spatial direct MV code.
michael
parents:
11093
diff
changeset
|
268 sub_mb_type |= MB_TYPE_L0L1; |
6309 | 269 } |
270 | |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
271 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){ |
11105
77c5116751b7
Set partitioning to 16x16 for spatial direct MBs with mixed interlacing.
michael
parents:
11104
diff
changeset
|
272 int n=0; |
6309 | 273 for(i8=0; i8<4; i8++){ |
274 int x8 = i8&1; | |
275 int y8 = i8>>1; | |
276 int xy8 = x8+y8*b8_stride; | |
277 int xy4 = 3*x8+y8*b4_stride; | |
11095
2aeb7a1d1c7f
Zero a/b only in the branch where they need to be zeroed.
michael
parents:
11094
diff
changeset
|
278 int a,b; |
6309 | 279 |
280 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
281 continue; | |
282 h->sub_mb_type[i8] = sub_mb_type; | |
283 | |
284 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); | |
285 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); | |
11078
e1eb8879e368
Long term references behave different from short term in spatial direct MV calculation.
michael
parents:
10929
diff
changeset
|
286 if(!IS_INTRA(mb_type_col[y8]) && !h->ref_list[1][0].long_ref |
6309 | 287 && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1) |
288 || (l1ref0[xy8] < 0 && l1ref1[xy8] == 0 && FFABS(l1mv1[xy4][0]) <= 1 && FFABS(l1mv1[xy4][1]) <= 1))){ | |
11095
2aeb7a1d1c7f
Zero a/b only in the branch where they need to be zeroed.
michael
parents:
11094
diff
changeset
|
289 a=b=0; |
6309 | 290 if(ref[0] > 0) |
291 a= pack16to32(mv[0][0],mv[0][1]); | |
292 if(ref[1] > 0) | |
293 b= pack16to32(mv[1][0],mv[1][1]); | |
11105
77c5116751b7
Set partitioning to 16x16 for spatial direct MBs with mixed interlacing.
michael
parents:
11104
diff
changeset
|
294 n++; |
6309 | 295 }else{ |
296 a= pack16to32(mv[0][0],mv[0][1]); | |
297 b= pack16to32(mv[1][0],mv[1][1]); | |
298 } | |
299 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4); | |
300 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4); | |
301 } | |
11105
77c5116751b7
Set partitioning to 16x16 for spatial direct MBs with mixed interlacing.
michael
parents:
11104
diff
changeset
|
302 if(!is_b8x8 && !(n&3)) |
77c5116751b7
Set partitioning to 16x16 for spatial direct MBs with mixed interlacing.
michael
parents:
11104
diff
changeset
|
303 *mb_type= (*mb_type & ~(MB_TYPE_8x8|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_P1L0|MB_TYPE_P1L1))|MB_TYPE_16x16|MB_TYPE_DIRECT2; |
6309 | 304 }else if(IS_16X16(*mb_type)){ |
11095
2aeb7a1d1c7f
Zero a/b only in the branch where they need to be zeroed.
michael
parents:
11094
diff
changeset
|
305 int a,b; |
4540 | 306 |
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
307 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1); |
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
308 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1); |
11078
e1eb8879e368
Long term references behave different from short term in spatial direct MV calculation.
michael
parents:
10929
diff
changeset
|
309 if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref |
4001 | 310 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1) |
311 || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 | |
11097 | 312 && h->x264_build>33U))){ |
11095
2aeb7a1d1c7f
Zero a/b only in the branch where they need to be zeroed.
michael
parents:
11094
diff
changeset
|
313 a=b=0; |
2396 | 314 if(ref[0] > 0) |
4540 | 315 a= pack16to32(mv[0][0],mv[0][1]); |
2396 | 316 if(ref[1] > 0) |
4540 | 317 b= pack16to32(mv[1][0],mv[1][1]); |
2396 | 318 }else{ |
4540 | 319 a= pack16to32(mv[0][0],mv[0][1]); |
320 b= pack16to32(mv[1][0],mv[1][1]); | |
321 } | |
322 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4); | |
323 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, b, 4); | |
2396 | 324 }else{ |
11104
bb877c9cb102
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
michael
parents:
11103
diff
changeset
|
325 int n=0; |
2396 | 326 for(i8=0; i8<4; i8++){ |
327 const int x8 = i8&1; | |
328 const int y8 = i8>>1; | |
2967 | 329 |
2396 | 330 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
331 continue; | |
332 h->sub_mb_type[i8] = sub_mb_type; | |
2967 | 333 |
2396 | 334 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); |
335 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
336 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); |
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
337 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); |
2967 | 338 |
2396 | 339 /* col_zero_flag */ |
11078
e1eb8879e368
Long term references behave different from short term in spatial direct MV calculation.
michael
parents:
10929
diff
changeset
|
340 if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && ( l1ref0[x8 + y8*b8_stride] == 0 |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
341 || (l1ref0[x8 + y8*b8_stride] < 0 && l1ref1[x8 + y8*b8_stride] == 0 |
11097 | 342 && h->x264_build>33U))){ |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
343 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*b8_stride] == 0 ? l1mv0 : l1mv1; |
3002 | 344 if(IS_SUB_8X8(sub_mb_type)){ |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
345 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride]; |
4001 | 346 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
3002 | 347 if(ref[0] == 0) |
348 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
349 if(ref[1] == 0) | |
350 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
11104
bb877c9cb102
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
michael
parents:
11103
diff
changeset
|
351 n+=4; |
3002 | 352 } |
11103 | 353 }else{ |
354 int m=0; | |
2396 | 355 for(i4=0; i4<4; i4++){ |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
356 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride]; |
4001 | 357 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
2396 | 358 if(ref[0] == 0) |
359 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
360 if(ref[1] == 0) | |
361 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
11103 | 362 m++; |
2396 | 363 } |
364 } | |
11103 | 365 if(!(m&3)) |
366 h->sub_mb_type[i8]+= MB_TYPE_16x16 - MB_TYPE_8x8; | |
11104
bb877c9cb102
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
michael
parents:
11103
diff
changeset
|
367 n+=m; |
11103 | 368 } |
2396 | 369 } |
370 } | |
11104
bb877c9cb102
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
michael
parents:
11103
diff
changeset
|
371 if(!is_b8x8 && !(n&15)) |
bb877c9cb102
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
michael
parents:
11103
diff
changeset
|
372 *mb_type= (*mb_type & ~(MB_TYPE_8x8|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_P1L0|MB_TYPE_P1L1))|MB_TYPE_16x16|MB_TYPE_DIRECT2; |
2396 | 373 } |
374 }else{ /* direct temporal mv pred */ | |
3316 | 375 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; |
376 const int *dist_scale_factor = h->dist_scale_factor; | |
11101 | 377 int ref_offset; |
3316 | 378 |
7494 | 379 if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ |
7898
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
380 map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0]; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
381 map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1]; |
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7897
diff
changeset
|
382 dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1]; |
7902
8b8be8f2b647
Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents:
7901
diff
changeset
|
383 } |
11101 | 384 ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3); //if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) ref_offset=16 else 0 |
7902
8b8be8f2b647
Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
michael
parents:
7901
diff
changeset
|
385 |
7494 | 386 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){ |
7495 | 387 int y_shift = 2*!IS_INTERLACED(*mb_type); |
11084
6e564ab180d1
Add assert(sps.direct_8x8_inference_flag) to FIXME comment.
michael
parents:
11083
diff
changeset
|
388 assert(h->sps.direct_8x8_inference_flag); |
7494 | 389 |
390 for(i8=0; i8<4; i8++){ | |
391 const int x8 = i8&1; | |
392 const int y8 = i8>>1; | |
393 int ref0, scale; | |
394 const int16_t (*l1mv)[2]= l1mv0; | |
395 | |
396 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
397 continue; | |
398 h->sub_mb_type[i8] = sub_mb_type; | |
399 | |
400 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
401 if(IS_INTRA(mb_type_col[y8])){ | |
402 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
403 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
404 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
405 continue; | |
3316 | 406 } |
407 | |
7494 | 408 ref0 = l1ref0[x8 + y8*b8_stride]; |
409 if(ref0 >= 0) | |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
410 ref0 = map_col_to_list0[0][ref0 + ref_offset]; |
7494 | 411 else{ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
412 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset]; |
7494 | 413 l1mv= l1mv1; |
3316 | 414 } |
7494 | 415 scale = dist_scale_factor[ref0]; |
416 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
417 | |
418 { | |
419 const int16_t *mv_col = l1mv[x8*3 + y8*b4_stride]; | |
420 int my_col = (mv_col[1]<<y_shift)/2; | |
421 int mx = (scale * mv_col[0] + 128) >> 8; | |
422 int my = (scale * my_col + 128) >> 8; | |
423 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); | |
424 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4); | |
425 } | |
426 } | |
427 return; | |
428 } | |
3316 | 429 |
430 /* one-to-one mv scaling */ | |
431 | |
2396 | 432 if(IS_16X16(*mb_type)){ |
4541 | 433 int ref, mv0, mv1; |
434 | |
2396 | 435 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
436 if(IS_INTRA(mb_type_col[0])){ |
4541 | 437 ref=mv0=mv1=0; |
2396 | 438 }else{ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
439 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0] + ref_offset] |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
440 : map_col_to_list0[1][l1ref1[0] + ref_offset]; |
3316 | 441 const int scale = dist_scale_factor[ref0]; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
442 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; |
2396 | 443 int mv_l0[2]; |
3316 | 444 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
445 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
4541 | 446 ref= ref0; |
447 mv0= pack16to32(mv_l0[0],mv_l0[1]); | |
448 mv1= pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
449 } | |
450 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1); | |
451 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, mv0, 4); | |
452 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, mv1, 4); | |
2396 | 453 }else{ |
454 for(i8=0; i8<4; i8++){ | |
455 const int x8 = i8&1; | |
456 const int y8 = i8>>1; | |
3316 | 457 int ref0, scale; |
2834 | 458 const int16_t (*l1mv)[2]= l1mv0; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
459 |
2396 | 460 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
461 continue; | |
462 h->sub_mb_type[i8] = sub_mb_type; | |
3316 | 463 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); |
7493
e5b93d01b472
Factorize some code between temporal and spatial direct mode.
michael
parents:
7488
diff
changeset
|
464 if(IS_INTRA(mb_type_col[0])){ |
2396 | 465 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); |
466 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
467 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
468 continue; | |
469 } | |
2967 | 470 |
11083
a270b4c67089
ref_offset must be added after checking references validity.
michael
parents:
11078
diff
changeset
|
471 ref0 = l1ref0[x8 + y8*b8_stride]; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
472 if(ref0 >= 0) |
11083
a270b4c67089
ref_offset must be added after checking references validity.
michael
parents:
11078
diff
changeset
|
473 ref0 = map_col_to_list0[0][ref0 + ref_offset]; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
474 else{ |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7902
diff
changeset
|
475 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride] + ref_offset]; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
476 l1mv= l1mv1; |
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
477 } |
3316 | 478 scale = dist_scale_factor[ref0]; |
2967 | 479 |
2396 | 480 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); |
3002 | 481 if(IS_SUB_8X8(sub_mb_type)){ |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
482 const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride]; |
3316 | 483 int mx = (scale * mv_col[0] + 128) >> 8; |
484 int my = (scale * mv_col[1] + 128) >> 8; | |
3002 | 485 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); |
486 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4); | |
487 }else | |
2396 | 488 for(i4=0; i4<4; i4++){ |
7498
e7006afcb1c6
Use local variabes for *stride, where local variables exist.
michael
parents:
7497
diff
changeset
|
489 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride]; |
2396 | 490 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; |
3316 | 491 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
492 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
2396 | 493 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = |
494 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
495 } | |
496 } | |
497 } | |
498 } | |
499 } |