Mercurial > libavcodec.hg
annotate h264.c @ 5215:2b72f9bc4f06 libavcodec
license header consistency cosmetics
| author | diego |
|---|---|
| date | Thu, 05 Jul 2007 10:40:25 +0000 |
| parents | ea61020e5e87 |
| children | 099c495618c1 |
| rev | line source |
|---|---|
| 1168 | 1 /* |
| 2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
| 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 /** |
| 23 * @file h264.c | |
| 24 * H.264 / AVC / MPEG4 part10 codec. | |
| 25 * @author Michael Niedermayer <michaelni@gmx.at> | |
| 26 */ | |
| 27 | |
| 28 #include "dsputil.h" | |
| 29 #include "avcodec.h" | |
| 30 #include "mpegvideo.h" | |
| 4975 | 31 #include "h264.h" |
| 1168 | 32 #include "h264data.h" |
| 4975 | 33 #include "h264_parser.h" |
| 1168 | 34 #include "golomb.h" |
| 35 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
36 #include "cabac.h" |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
37 |
|
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3219
diff
changeset
|
38 //#undef NDEBUG |
| 1168 | 39 #include <assert.h> |
| 40 | |
| 41 static VLC coeff_token_vlc[4]; | |
| 42 static VLC chroma_dc_coeff_token_vlc; | |
| 43 | |
| 44 static VLC total_zeros_vlc[15]; | |
| 45 static VLC chroma_dc_total_zeros_vlc[3]; | |
| 46 | |
| 47 static VLC run_vlc[6]; | |
| 48 static VLC run7_vlc; | |
| 49 | |
| 1234 | 50 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 51 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
52 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
53 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); |
| 1234 | 54 |
|
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4277
diff
changeset
|
55 static av_always_inline uint32_t pack16to32(int a, int b){ |
| 1269 | 56 #ifdef WORDS_BIGENDIAN |
| 57 return (b&0xFFFF) + (a<<16); | |
| 58 #else | |
| 59 return (a&0xFFFF) + (b<<16); | |
| 60 #endif | |
| 61 } | |
| 62 | |
|
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
63 const uint8_t ff_rem6[52]={ |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
64 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
65 }; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
66 |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
67 const uint8_t ff_div6[52]={ |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
68 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
69 }; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
70 |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
71 |
| 1168 | 72 /** |
| 73 * fill a rectangle. | |
| 2392 | 74 * @param h height of the rectangle, should be a constant |
| 75 * @param w width of the rectangle, should be a constant | |
| 1168 | 76 * @param size the size of val (1 or 4), should be a constant |
| 77 */ | |
|
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4277
diff
changeset
|
78 static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ |
| 1187 | 79 uint8_t *p= (uint8_t*)vp; |
| 1168 | 80 assert(size==1 || size==4); |
| 3315 | 81 assert(w<=4); |
| 2967 | 82 |
| 1168 | 83 w *= size; |
| 84 stride *= size; | |
| 2967 | 85 |
| 2962 | 86 assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
| 2669 | 87 assert((stride&(w-1))==0); |
| 3315 | 88 if(w==2){ |
| 89 const uint16_t v= size==4 ? val : val*0x0101; | |
| 90 *(uint16_t*)(p + 0*stride)= v; | |
| 91 if(h==1) return; | |
| 92 *(uint16_t*)(p + 1*stride)= v; | |
| 93 if(h==2) return; | |
| 1168 | 94 *(uint16_t*)(p + 2*stride)= |
| 3315 | 95 *(uint16_t*)(p + 3*stride)= v; |
| 96 }else if(w==4){ | |
| 97 const uint32_t v= size==4 ? val : val*0x01010101; | |
| 98 *(uint32_t*)(p + 0*stride)= v; | |
| 99 if(h==1) return; | |
| 100 *(uint32_t*)(p + 1*stride)= v; | |
| 101 if(h==2) return; | |
| 1168 | 102 *(uint32_t*)(p + 2*stride)= |
| 3315 | 103 *(uint32_t*)(p + 3*stride)= v; |
| 104 }else if(w==8){ | |
| 105 //gcc can't optimize 64bit math on x86_32 | |
| 106 #if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64) | |
| 107 const uint64_t v= val*0x0100000001ULL; | |
| 108 *(uint64_t*)(p + 0*stride)= v; | |
| 109 if(h==1) return; | |
| 110 *(uint64_t*)(p + 1*stride)= v; | |
| 111 if(h==2) return; | |
| 1168 | 112 *(uint64_t*)(p + 2*stride)= |
| 3315 | 113 *(uint64_t*)(p + 3*stride)= v; |
| 114 }else if(w==16){ | |
| 115 const uint64_t v= val*0x0100000001ULL; | |
| 1168 | 116 *(uint64_t*)(p + 0+0*stride)= |
| 117 *(uint64_t*)(p + 8+0*stride)= | |
| 118 *(uint64_t*)(p + 0+1*stride)= | |
| 3315 | 119 *(uint64_t*)(p + 8+1*stride)= v; |
| 120 if(h==2) return; | |
| 1168 | 121 *(uint64_t*)(p + 0+2*stride)= |
| 122 *(uint64_t*)(p + 8+2*stride)= | |
| 123 *(uint64_t*)(p + 0+3*stride)= | |
| 3315 | 124 *(uint64_t*)(p + 8+3*stride)= v; |
| 125 #else | |
| 126 *(uint32_t*)(p + 0+0*stride)= | |
| 127 *(uint32_t*)(p + 4+0*stride)= val; | |
| 128 if(h==1) return; | |
| 129 *(uint32_t*)(p + 0+1*stride)= | |
| 130 *(uint32_t*)(p + 4+1*stride)= val; | |
| 131 if(h==2) return; | |
| 132 *(uint32_t*)(p + 0+2*stride)= | |
| 133 *(uint32_t*)(p + 4+2*stride)= | |
| 134 *(uint32_t*)(p + 0+3*stride)= | |
| 135 *(uint32_t*)(p + 4+3*stride)= val; | |
| 136 }else if(w==16){ | |
| 137 *(uint32_t*)(p + 0+0*stride)= | |
| 138 *(uint32_t*)(p + 4+0*stride)= | |
| 139 *(uint32_t*)(p + 8+0*stride)= | |
| 140 *(uint32_t*)(p +12+0*stride)= | |
| 141 *(uint32_t*)(p + 0+1*stride)= | |
| 142 *(uint32_t*)(p + 4+1*stride)= | |
| 143 *(uint32_t*)(p + 8+1*stride)= | |
| 144 *(uint32_t*)(p +12+1*stride)= val; | |
| 145 if(h==2) return; | |
| 146 *(uint32_t*)(p + 0+2*stride)= | |
| 147 *(uint32_t*)(p + 4+2*stride)= | |
| 148 *(uint32_t*)(p + 8+2*stride)= | |
| 149 *(uint32_t*)(p +12+2*stride)= | |
| 150 *(uint32_t*)(p + 0+3*stride)= | |
| 151 *(uint32_t*)(p + 4+3*stride)= | |
| 152 *(uint32_t*)(p + 8+3*stride)= | |
| 153 *(uint32_t*)(p +12+3*stride)= val; | |
| 154 #endif | |
| 1168 | 155 }else |
| 156 assert(0); | |
| 3315 | 157 assert(h==4); |
| 1168 | 158 } |
| 159 | |
| 3028 | 160 static void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
| 1168 | 161 MpegEncContext * const s = &h->s; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
162 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 163 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
| 164 int topleft_type, top_type, topright_type, left_type[2]; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
165 int left_block[8]; |
| 1168 | 166 int i; |
| 167 | |
| 3482 | 168 //FIXME deblocking could skip the intra and nnz parts. |
| 169 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy-s->mb_stride]) && !FRAME_MBAFF) | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
170 return; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
171 |
| 2967 | 172 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it |
| 173 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
174 top_xy = mb_xy - s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
175 topleft_xy = top_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
176 topright_xy= top_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
177 left_xy[1] = left_xy[0] = mb_xy-1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
178 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
179 left_block[1]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
180 left_block[2]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
181 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
182 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
183 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
184 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
185 left_block[7]= 11; |
| 3316 | 186 if(FRAME_MBAFF){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
187 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
188 const int top_pair_xy = pair_xy - s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
189 const int topleft_pair_xy = top_pair_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
190 const int topright_pair_xy = top_pair_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
191 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
192 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
193 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
194 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
195 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
196 const int bottom = (s->mb_y & 1); |
| 4600 | 197 tprintf(s->avctx, "fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag); |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
198 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
199 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
200 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
201 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
202 top_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
203 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
204 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
205 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
206 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
207 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
208 topleft_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
209 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
210 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
211 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
212 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
213 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
214 topright_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
215 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
216 if (left_mb_frame_flag != curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
217 left_xy[1] = left_xy[0] = pair_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
218 if (curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
219 if (bottom) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
220 left_block[0]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
221 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
222 left_block[2]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
223 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
224 left_block[4]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
225 left_block[5]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
226 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
227 left_block[7]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
228 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
229 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
230 left_block[1]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
231 left_block[2]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
232 left_block[3]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
233 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
234 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
235 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
236 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
237 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
238 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
239 left_xy[1] += s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
240 //left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
241 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
242 left_block[2]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
243 left_block[3]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
244 //left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
245 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
246 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
247 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
248 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
249 } |
| 1168 | 250 } |
| 251 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
252 h->top_mb_xy = top_xy; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
253 h->left_mb_xy[0] = left_xy[0]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
254 h->left_mb_xy[1] = left_xy[1]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
255 if(for_deblock){ |
| 3482 | 256 topleft_type = 0; |
| 257 topright_type = 0; | |
| 2449 | 258 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; |
| 259 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 260 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 3316 | 261 |
| 262 if(FRAME_MBAFF && !IS_INTRA(mb_type)){ | |
| 263 int list; | |
| 264 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14]; | |
| 265 for(i=0; i<16; i++) | |
| 266 h->non_zero_count_cache[scan8[i]] = (v>>i)&1; | |
| 4533 | 267 for(list=0; list<h->list_count; list++){ |
| 3316 | 268 if(USES_LIST(mb_type,list)){ |
| 269 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]]; | |
| 270 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]]; | |
| 3776 | 271 int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; |
| 3316 | 272 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){ |
| 273 dst[0] = src[0]; | |
| 274 dst[1] = src[1]; | |
| 275 dst[2] = src[2]; | |
| 276 dst[3] = src[3]; | |
| 277 } | |
| 278 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] = | |
| 279 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101; | |
| 280 ref += h->b8_stride; | |
| 281 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] = | |
| 282 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101; | |
| 283 }else{ | |
| 284 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4); | |
| 285 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); | |
| 286 } | |
| 287 } | |
| 288 } | |
| 2449 | 289 }else{ |
| 290 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 291 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
| 292 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
| 293 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 294 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 295 } | |
| 1168 | 296 |
| 297 if(IS_INTRA(mb_type)){ | |
| 2967 | 298 h->topleft_samples_available= |
| 299 h->top_samples_available= | |
| 1168 | 300 h->left_samples_available= 0xFFFF; |
| 301 h->topright_samples_available= 0xEEEA; | |
| 302 | |
| 303 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
| 304 h->topleft_samples_available= 0xB3FF; | |
| 305 h->top_samples_available= 0x33FF; | |
| 306 h->topright_samples_available= 0x26EA; | |
| 307 } | |
| 308 for(i=0; i<2; i++){ | |
| 309 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
| 310 h->topleft_samples_available&= 0xDF5F; | |
| 311 h->left_samples_available&= 0x5F5F; | |
| 312 } | |
| 313 } | |
| 2967 | 314 |
| 1168 | 315 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) |
| 316 h->topleft_samples_available&= 0x7FFF; | |
| 2967 | 317 |
| 1168 | 318 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) |
| 319 h->topright_samples_available&= 0xFBFF; | |
| 2967 | 320 |
| 1168 | 321 if(IS_INTRA4x4(mb_type)){ |
| 322 if(IS_INTRA4x4(top_type)){ | |
| 323 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
| 324 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
| 325 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
| 326 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
| 327 }else{ | |
| 328 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
329 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred)) |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
330 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
331 else{ |
| 1168 | 332 pred= 2; |
| 333 } | |
| 334 h->intra4x4_pred_mode_cache[4+8*0]= | |
| 335 h->intra4x4_pred_mode_cache[5+8*0]= | |
| 336 h->intra4x4_pred_mode_cache[6+8*0]= | |
| 337 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
| 338 } | |
| 339 for(i=0; i<2; i++){ | |
| 340 if(IS_INTRA4x4(left_type[i])){ | |
| 341 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
| 342 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
| 343 }else{ | |
| 344 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
345 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred)) |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
346 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
347 else{ |
| 1168 | 348 pred= 2; |
| 349 } | |
| 350 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
| 351 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
| 352 } | |
| 353 } | |
| 354 } | |
| 355 } | |
| 2967 | 356 |
| 357 | |
| 1168 | 358 /* |
| 2967 | 359 0 . T T. T T T T |
| 360 1 L . .L . . . . | |
| 361 2 L . .L . . . . | |
| 362 3 . T TL . . . . | |
| 363 4 L . .L . . . . | |
| 364 5 L . .. . . . . | |
| 1168 | 365 */ |
| 366 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
| 367 if(top_type){ | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
368 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
369 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
370 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
371 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
| 2967 | 372 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
373 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
374 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
| 2967 | 375 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
376 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
377 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
| 2967 | 378 |
| 1168 | 379 }else{ |
| 2967 | 380 h->non_zero_count_cache[4+8*0]= |
| 1168 | 381 h->non_zero_count_cache[5+8*0]= |
| 382 h->non_zero_count_cache[6+8*0]= | |
| 383 h->non_zero_count_cache[7+8*0]= | |
| 2967 | 384 |
| 1168 | 385 h->non_zero_count_cache[1+8*0]= |
| 386 h->non_zero_count_cache[2+8*0]= | |
| 2967 | 387 |
| 1168 | 388 h->non_zero_count_cache[1+8*3]= |
| 2314 | 389 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
| 2967 | 390 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
391 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
392 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
393 for (i=0; i<2; i++) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
394 if(left_type[i]){ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
395 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
396 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
397 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
398 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
399 }else{ |
| 2967 | 400 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
| 401 h->non_zero_count_cache[3+8*2 + 2*8*i]= | |
| 402 h->non_zero_count_cache[0+8*1 + 8*i]= | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
403 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
404 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
405 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
406 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
407 if( h->pps.cabac ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
408 // top_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
409 if(top_type) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
410 h->top_cbp = h->cbp_table[top_xy]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
411 } else if(IS_INTRA(mb_type)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
412 h->top_cbp = 0x1C0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
413 } else { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
414 h->top_cbp = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
415 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
416 // left_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
417 if (left_type[0]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
418 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
419 } else if(IS_INTRA(mb_type)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
420 h->left_cbp = 0x1C0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
421 } else { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
422 h->left_cbp = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
423 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
424 if (left_type[0]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
425 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
426 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
427 if (left_type[1]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
428 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
429 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
430 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
431 |
| 1168 | 432 #if 1 |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
433 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
| 1168 | 434 int list; |
| 4533 | 435 for(list=0; list<h->list_count; list++){ |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
436 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){ |
| 1168 | 437 /*if(!h->mv_cache_clean[list]){ |
| 438 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
| 439 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
| 440 h->mv_cache_clean[list]= 1; | |
| 441 }*/ | |
| 2396 | 442 continue; |
| 1168 | 443 } |
| 444 h->mv_cache_clean[list]= 0; | |
| 2967 | 445 |
| 3212 | 446 if(USES_LIST(top_type, list)){ |
| 1168 | 447 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
| 448 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 449 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
| 450 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
| 451 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
| 452 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
| 453 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
| 454 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
| 455 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
| 456 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
| 457 }else{ | |
| 2967 | 458 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= |
| 459 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
| 460 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
| 1168 | 461 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; |
| 462 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
| 463 } | |
| 464 | |
| 4546 | 465 for(i=0; i<2; i++){ |
| 466 int cache_idx = scan8[0] - 1 + i*2*8; | |
| 467 if(USES_LIST(left_type[i], list)){ | |
| 468 const int b_xy= h->mb2b_xy[left_xy[i]] + 3; | |
| 469 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1; | |
| 470 *(uint32_t*)h->mv_cache[list][cache_idx ]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0+i*2]]; | |
| 471 *(uint32_t*)h->mv_cache[list][cache_idx+8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1+i*2]]; | |
| 472 h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0+i*2]>>1)]; | |
| 473 h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1+i*2]>>1)]; | |
| 474 }else{ | |
| 475 *(uint32_t*)h->mv_cache [list][cache_idx ]= | |
| 476 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0; | |
| 477 h->ref_cache[list][cache_idx ]= | |
| 478 h->ref_cache[list][cache_idx+8]= left_type[i] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 479 } | |
| 1168 | 480 } |
| 481 | |
| 3519 | 482 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF) |
| 2449 | 483 continue; |
| 484 | |
| 3212 | 485 if(USES_LIST(topleft_type, list)){ |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
486 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
487 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
488 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
489 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
490 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
491 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
492 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
493 } |
| 2967 | 494 |
| 3212 | 495 if(USES_LIST(topright_type, list)){ |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
496 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
497 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
498 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
499 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
500 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
501 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
502 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
503 } |
| 2967 | 504 |
| 3519 | 505 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) |
| 3482 | 506 continue; |
| 2967 | 507 |
| 508 h->ref_cache[list][scan8[5 ]+1] = | |
| 509 h->ref_cache[list][scan8[7 ]+1] = | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
510 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |
| 2967 | 511 h->ref_cache[list][scan8[4 ]] = |
| 1168 | 512 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; |
| 513 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
| 514 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
515 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
| 1168 | 516 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= |
| 517 *(uint32_t*)h->mv_cache [list][scan8[12]]= 0; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
518 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
519 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
520 /* XXX beurk, Load mvd */ |
| 3212 | 521 if(USES_LIST(top_type, list)){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
522 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
523 *(uint32_t*)h->mvd_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 0]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
524 *(uint32_t*)h->mvd_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 1]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
525 *(uint32_t*)h->mvd_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 2]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
526 *(uint32_t*)h->mvd_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 3]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
527 }else{ |
| 2967 | 528 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]= |
| 529 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]= | |
| 530 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]= | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
531 *(uint32_t*)h->mvd_cache [list][scan8[0] + 3 - 1*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
532 } |
| 3212 | 533 if(USES_LIST(left_type[0], list)){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
534 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
535 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[0]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
536 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[1]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
537 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
538 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
539 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 1*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
540 } |
| 3212 | 541 if(USES_LIST(left_type[1], list)){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
542 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
543 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[2]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
544 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[3]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
545 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
546 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
547 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 3*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
548 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
549 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
550 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
551 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
552 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
553 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
| 2396 | 554 |
| 555 if(h->slice_type == B_TYPE){ | |
| 556 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
| 557 | |
| 558 if(IS_DIRECT(top_type)){ | |
| 559 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
| 560 }else if(IS_8X8(top_type)){ | |
| 561 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 562 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
| 563 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
| 564 }else{ | |
| 565 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
| 566 } | |
| 2967 | 567 |
| 3316 | 568 if(IS_DIRECT(left_type[0])) |
| 569 h->direct_cache[scan8[0] - 1 + 0*8]= 1; | |
| 570 else if(IS_8X8(left_type[0])) | |
| 571 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)]; | |
| 572 else | |
| 573 h->direct_cache[scan8[0] - 1 + 0*8]= 0; | |
| 574 | |
| 575 if(IS_DIRECT(left_type[1])) | |
| 2396 | 576 h->direct_cache[scan8[0] - 1 + 2*8]= 1; |
| 3316 | 577 else if(IS_8X8(left_type[1])) |
| 578 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)]; | |
| 579 else | |
| 2396 | 580 h->direct_cache[scan8[0] - 1 + 2*8]= 0; |
| 3316 | 581 } |
| 582 } | |
| 583 | |
| 584 if(FRAME_MBAFF){ | |
| 585 #define MAP_MVS\ | |
| 586 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\ | |
| 587 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\ | |
| 588 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\ | |
| 589 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\ | |
| 590 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\ | |
| 591 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\ | |
| 592 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\ | |
| 593 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\ | |
| 594 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\ | |
| 595 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1]) | |
| 596 if(MB_FIELD){ | |
| 597 #define MAP_F2F(idx, mb_type)\ | |
| 598 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
| 599 h->ref_cache[list][idx] <<= 1;\ | |
| 600 h->mv_cache[list][idx][1] /= 2;\ | |
| 601 h->mvd_cache[list][idx][1] /= 2;\ | |
| 2396 | 602 } |
| 3316 | 603 MAP_MVS |
| 604 #undef MAP_F2F | |
| 605 }else{ | |
| 606 #define MAP_F2F(idx, mb_type)\ | |
| 607 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
| 608 h->ref_cache[list][idx] >>= 1;\ | |
| 609 h->mv_cache[list][idx][1] <<= 1;\ | |
| 610 h->mvd_cache[list][idx][1] <<= 1;\ | |
| 611 } | |
| 612 MAP_MVS | |
| 613 #undef MAP_F2F | |
| 2396 | 614 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
615 } |
| 1168 | 616 } |
| 617 } | |
| 618 #endif | |
| 2755 | 619 |
| 620 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); | |
| 1168 | 621 } |
| 622 | |
| 623 static inline void write_back_intra_pred_mode(H264Context *h){ | |
| 624 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
625 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 626 |
| 627 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
| 628 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
| 629 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
| 630 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
| 631 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
| 632 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
| 633 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
| 634 } | |
| 635 | |
| 636 /** | |
| 637 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 638 */ | |
| 639 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
| 640 MpegEncContext * const s = &h->s; | |
| 641 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
| 642 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
| 643 int i; | |
| 2967 | 644 |
| 1168 | 645 if(!(h->top_samples_available&0x8000)){ |
| 646 for(i=0; i<4; i++){ | |
| 647 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
| 648 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
649 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
| 1168 | 650 return -1; |
| 651 } else if(status){ | |
| 652 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
| 653 } | |
| 654 } | |
| 655 } | |
| 2967 | 656 |
| 1168 | 657 if(!(h->left_samples_available&0x8000)){ |
| 658 for(i=0; i<4; i++){ | |
| 659 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
| 660 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
661 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
| 1168 | 662 return -1; |
| 663 } else if(status){ | |
| 664 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
| 665 } | |
| 666 } | |
| 667 } | |
| 668 | |
| 669 return 0; | |
| 670 } //FIXME cleanup like next | |
| 671 | |
| 672 /** | |
| 673 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 674 */ | |
| 675 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
| 676 MpegEncContext * const s = &h->s; | |
| 677 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
| 678 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
| 2967 | 679 |
| 4529 | 680 if(mode > 6U) { |
| 2392 | 681 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y); |
| 2163 | 682 return -1; |
| 2392 | 683 } |
| 2967 | 684 |
| 1168 | 685 if(!(h->top_samples_available&0x8000)){ |
| 686 mode= top[ mode ]; | |
| 687 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
688 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 689 return -1; |
| 690 } | |
| 691 } | |
| 2967 | 692 |
| 1168 | 693 if(!(h->left_samples_available&0x8000)){ |
| 694 mode= left[ mode ]; | |
| 695 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
696 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 697 return -1; |
| 2967 | 698 } |
| 1168 | 699 } |
| 700 | |
| 701 return mode; | |
| 702 } | |
| 703 | |
| 704 /** | |
| 705 * gets the predicted intra4x4 prediction mode. | |
| 706 */ | |
| 707 static inline int pred_intra_mode(H264Context *h, int n){ | |
| 708 const int index8= scan8[n]; | |
| 709 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
| 710 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
| 711 const int min= FFMIN(left, top); | |
| 712 | |
| 4600 | 713 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min); |
| 1168 | 714 |
| 715 if(min<0) return DC_PRED; | |
| 716 else return min; | |
| 717 } | |
| 718 | |
| 719 static inline void write_back_non_zero_count(H264Context *h){ | |
| 720 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
721 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
722 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
723 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
724 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
725 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
726 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
727 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
728 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
729 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4]; |
| 2967 | 730 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
731 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
732 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
733 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
734 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
735 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
736 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
737 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
| 3316 | 738 |
| 739 if(FRAME_MBAFF){ | |
| 740 // store all luma nnzs, for deblocking | |
| 741 int v = 0, i; | |
| 742 for(i=0; i<16; i++) | |
| 743 v += (!!h->non_zero_count_cache[scan8[i]]) << i; | |
| 744 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v; | |
| 745 } | |
| 1168 | 746 } |
| 747 | |
| 748 /** | |
| 749 * gets the predicted number of non zero coefficients. | |
| 750 * @param n block index | |
| 751 */ | |
| 752 static inline int pred_non_zero_count(H264Context *h, int n){ | |
| 753 const int index8= scan8[n]; | |
| 754 const int left= h->non_zero_count_cache[index8 - 1]; | |
| 755 const int top = h->non_zero_count_cache[index8 - 8]; | |
| 756 int i= left + top; | |
| 2967 | 757 |
| 1168 | 758 if(i<64) i= (i+1)>>1; |
| 759 | |
| 4600 | 760 tprintf(h->s.avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
| 1168 | 761 |
| 762 return i&31; | |
| 763 } | |
| 764 | |
| 1169 | 765 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
| 766 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
| 4600 | 767 MpegEncContext *s = &h->s; |
| 1169 | 768 |
| 3316 | 769 /* there is no consistent mapping of mvs to neighboring locations that will |
| 770 * make mbaff happy, so we can't move all this logic to fill_caches */ | |
| 771 if(FRAME_MBAFF){ | |
| 3776 | 772 const uint32_t *mb_types = s->current_picture_ptr->mb_type; |
| 3316 | 773 const int16_t *mv; |
| 774 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0; | |
| 775 *C = h->mv_cache[list][scan8[0]-2]; | |
| 776 | |
| 777 if(!MB_FIELD | |
| 778 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){ | |
| 779 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3); | |
| 780 if(IS_INTERLACED(mb_types[topright_xy])){ | |
| 781 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\ | |
| 782 const int x4 = X4, y4 = Y4;\ | |
| 783 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\ | |
| 784 if(!USES_LIST(mb_type,list) && !IS_8X8(mb_type))\ | |
| 785 return LIST_NOT_USED;\ | |
| 786 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\ | |
| 787 h->mv_cache[list][scan8[0]-2][0] = mv[0];\ | |
| 788 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\ | |
| 789 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP; | |
| 790 | |
| 791 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1); | |
| 792 } | |
| 793 } | |
| 794 if(topright_ref == PART_NOT_AVAILABLE | |
| 795 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4 | |
| 796 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){ | |
| 797 if(!MB_FIELD | |
| 798 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ | |
| 799 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1); | |
| 800 } | |
| 801 if(MB_FIELD | |
| 802 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]]) | |
| 803 && i >= scan8[0]+8){ | |
| 804 // leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok. | |
| 805 SET_DIAG_MV(>>1, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2); | |
| 806 } | |
| 807 } | |
| 808 #undef SET_DIAG_MV | |
| 809 } | |
| 810 | |
| 1169 | 811 if(topright_ref != PART_NOT_AVAILABLE){ |
| 812 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
| 813 return topright_ref; | |
| 814 }else{ | |
| 4600 | 815 tprintf(s->avctx, "topright MV not available\n"); |
| 1170 | 816 |
| 1169 | 817 *C= h->mv_cache[list][ i - 8 - 1 ]; |
| 818 return h->ref_cache[list][ i - 8 - 1 ]; | |
| 819 } | |
| 820 } | |
| 821 | |
| 1168 | 822 /** |
| 823 * gets the predicted MV. | |
| 824 * @param n the block index | |
| 825 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
| 826 * @param mx the x component of the predicted motion vector | |
| 827 * @param my the y component of the predicted motion vector | |
| 828 */ | |
| 829 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
| 830 const int index8= scan8[n]; | |
| 831 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
| 832 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
| 833 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
| 834 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
| 1169 | 835 const int16_t * C; |
| 836 int diagonal_ref, match_count; | |
| 837 | |
| 1168 | 838 assert(part_width==1 || part_width==2 || part_width==4); |
| 1169 | 839 |
| 1168 | 840 /* mv_cache |
| 2967 | 841 B . . A T T T T |
| 1168 | 842 U . . L . . , . |
| 843 U . . L . . . . | |
| 844 U . . L . . , . | |
| 845 . . . L . . . . | |
| 846 */ | |
| 1169 | 847 |
| 848 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
| 849 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
| 4600 | 850 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count); |
| 1169 | 851 if(match_count > 1){ //most common |
| 852 *mx= mid_pred(A[0], B[0], C[0]); | |
| 853 *my= mid_pred(A[1], B[1], C[1]); | |
| 854 }else if(match_count==1){ | |
| 855 if(left_ref==ref){ | |
| 856 *mx= A[0]; | |
| 2967 | 857 *my= A[1]; |
| 1169 | 858 }else if(top_ref==ref){ |
| 859 *mx= B[0]; | |
| 2967 | 860 *my= B[1]; |
| 1169 | 861 }else{ |
| 862 *mx= C[0]; | |
| 2967 | 863 *my= C[1]; |
| 1169 | 864 } |
| 865 }else{ | |
| 866 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
| 867 *mx= A[0]; | |
| 2967 | 868 *my= A[1]; |
| 1168 | 869 }else{ |
| 870 *mx= mid_pred(A[0], B[0], C[0]); | |
| 871 *my= mid_pred(A[1], B[1], C[1]); | |
| 872 } | |
| 1169 | 873 } |
| 2967 | 874 |
| 4600 | 875 tprintf(h->s.avctx, "pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 876 } |
| 877 | |
| 878 /** | |
| 879 * gets the directionally predicted 16x8 MV. | |
| 880 * @param n the block index | |
| 881 * @param mx the x component of the predicted motion vector | |
| 882 * @param my the y component of the predicted motion vector | |
| 883 */ | |
| 884 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 885 if(n==0){ | |
| 886 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
| 887 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
| 888 | |
| 4600 | 889 tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list); |
| 2967 | 890 |
| 1168 | 891 if(top_ref == ref){ |
| 892 *mx= B[0]; | |
| 893 *my= B[1]; | |
| 894 return; | |
| 895 } | |
| 896 }else{ | |
| 897 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
| 898 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
| 2967 | 899 |
| 4600 | 900 tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 901 |
| 902 if(left_ref == ref){ | |
| 903 *mx= A[0]; | |
| 904 *my= A[1]; | |
| 905 return; | |
| 906 } | |
| 907 } | |
| 908 | |
| 909 //RARE | |
| 910 pred_motion(h, n, 4, list, ref, mx, my); | |
| 911 } | |
| 912 | |
| 913 /** | |
| 914 * gets the directionally predicted 8x16 MV. | |
| 915 * @param n the block index | |
| 916 * @param mx the x component of the predicted motion vector | |
| 917 * @param my the y component of the predicted motion vector | |
| 918 */ | |
| 919 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 920 if(n==0){ | |
| 921 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
| 922 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
| 2967 | 923 |
| 4600 | 924 tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 925 |
| 926 if(left_ref == ref){ | |
| 927 *mx= A[0]; | |
| 928 *my= A[1]; | |
| 929 return; | |
| 930 } | |
| 931 }else{ | |
| 1169 | 932 const int16_t * C; |
| 933 int diagonal_ref; | |
| 934 | |
| 935 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
| 2967 | 936 |
| 4600 | 937 tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 938 |
| 2967 | 939 if(diagonal_ref == ref){ |
| 1168 | 940 *mx= C[0]; |
| 941 *my= C[1]; | |
| 942 return; | |
| 943 } | |
| 944 } | |
| 945 | |
| 946 //RARE | |
| 947 pred_motion(h, n, 2, list, ref, mx, my); | |
| 948 } | |
| 949 | |
| 950 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
| 951 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
| 952 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
| 953 | |
| 4600 | 954 tprintf(h->s.avctx, "pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
| 1168 | 955 |
| 956 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
| 957 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
| 958 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
| 2967 | 959 |
| 1168 | 960 *mx = *my = 0; |
| 961 return; | |
| 962 } | |
| 2967 | 963 |
| 1168 | 964 pred_motion(h, 0, 4, 0, 0, mx, my); |
| 965 | |
| 966 return; | |
| 967 } | |
| 968 | |
| 2396 | 969 static inline void direct_dist_scale_factor(H264Context * const h){ |
| 970 const int poc = h->s.current_picture_ptr->poc; | |
| 971 const int poc1 = h->ref_list[1][0].poc; | |
| 972 int i; | |
| 973 for(i=0; i<h->ref_count[0]; i++){ | |
| 974 int poc0 = h->ref_list[0][i].poc; | |
| 4594 | 975 int td = av_clip(poc1 - poc0, -128, 127); |
| 2396 | 976 if(td == 0 /* FIXME || pic0 is a long-term ref */){ |
| 977 h->dist_scale_factor[i] = 256; | |
| 978 }else{ | |
| 4594 | 979 int tb = av_clip(poc - poc0, -128, 127); |
| 4001 | 980 int tx = (16384 + (FFABS(td) >> 1)) / td; |
| 4594 | 981 h->dist_scale_factor[i] = av_clip((tb*tx + 32) >> 6, -1024, 1023); |
| 2396 | 982 } |
| 983 } | |
| 3316 | 984 if(FRAME_MBAFF){ |
| 985 for(i=0; i<h->ref_count[0]; i++){ | |
| 986 h->dist_scale_factor_field[2*i] = | |
| 987 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i]; | |
| 988 } | |
| 989 } | |
| 2396 | 990 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
991 static inline void direct_ref_list_init(H264Context * const h){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
992 MpegEncContext * const s = &h->s; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
993 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
|
994 Picture * const cur = s->current_picture_ptr; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
995 int list, i, j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
996 if(cur->pict_type == I_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
997 cur->ref_count[0] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
998 if(cur->pict_type != B_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
999 cur->ref_count[1] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1000 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1001 cur->ref_count[list] = h->ref_count[list]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1002 for(j=0; j<h->ref_count[list]; j++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1003 cur->ref_poc[list][j] = h->ref_list[list][j].poc; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1004 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1005 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1006 return; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1007 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1008 for(i=0; i<ref1->ref_count[list]; i++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1009 const int poc = ref1->ref_poc[list][i]; |
| 3125 | 1010 h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */ |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1011 for(j=0; j<h->ref_count[list]; j++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1012 if(h->ref_list[list][j].poc == poc){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1013 h->map_col_to_list0[list][i] = j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1014 break; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1015 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1016 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1017 } |
| 3316 | 1018 if(FRAME_MBAFF){ |
| 1019 for(list=0; list<2; list++){ | |
| 1020 for(i=0; i<ref1->ref_count[list]; i++){ | |
| 1021 j = h->map_col_to_list0[list][i]; | |
| 1022 h->map_col_to_list0_field[list][2*i] = 2*j; | |
| 1023 h->map_col_to_list0_field[list][2*i+1] = 2*j+1; | |
| 1024 } | |
| 1025 } | |
| 1026 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1027 } |
| 2396 | 1028 |
| 1029 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
| 1030 MpegEncContext * const s = &h->s; | |
| 1031 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
| 1032 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1033 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1034 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
| 1035 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
|
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1036 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy]; |
| 2396 | 1037 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy]; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1038 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
| 2396 | 1039 const int is_b8x8 = IS_8X8(*mb_type); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
1040 unsigned int sub_mb_type; |
| 2396 | 1041 int i8, i4; |
| 1042 | |
| 3316 | 1043 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) |
| 2396 | 1044 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ |
| 1045 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
| 1046 * so we know exactly what block size to use */ | |
| 1047 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
| 2536 | 1048 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 3316 | 1049 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){ |
| 2396 | 1050 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ |
| 1051 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
| 1052 }else{ | |
| 1053 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 2536 | 1054 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1055 } |
| 1056 if(!is_b8x8) | |
| 1057 *mb_type |= MB_TYPE_DIRECT2; | |
| 3316 | 1058 if(MB_FIELD) |
| 1059 *mb_type |= MB_TYPE_INTERLACED; | |
| 2396 | 1060 |
| 4600 | 1061 tprintf(s->avctx, "mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col); |
| 2967 | 1062 |
| 2396 | 1063 if(h->direct_spatial_mv_pred){ |
| 1064 int ref[2]; | |
| 1065 int mv[2][2]; | |
| 1066 int list; | |
| 1067 | |
| 3316 | 1068 /* FIXME interlacing + spatial direct uses wrong colocated block positions */ |
| 1069 | |
| 2396 | 1070 /* ref = min(neighbors) */ |
| 1071 for(list=0; list<2; list++){ | |
| 1072 int refa = h->ref_cache[list][scan8[0] - 1]; | |
| 1073 int refb = h->ref_cache[list][scan8[0] - 8]; | |
| 1074 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
| 1075 if(refc == -2) | |
| 1076 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
| 1077 ref[list] = refa; | |
| 1078 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
| 1079 ref[list] = refb; | |
| 1080 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
| 1081 ref[list] = refc; | |
| 1082 if(ref[list] < 0) | |
| 1083 ref[list] = -1; | |
| 1084 } | |
| 1085 | |
| 1086 if(ref[0] < 0 && ref[1] < 0){ | |
| 1087 ref[0] = ref[1] = 0; | |
| 1088 mv[0][0] = mv[0][1] = | |
| 1089 mv[1][0] = mv[1][1] = 0; | |
| 1090 }else{ | |
| 1091 for(list=0; list<2; list++){ | |
| 1092 if(ref[list] >= 0) | |
| 1093 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
| 1094 else | |
| 1095 mv[list][0] = mv[list][1] = 0; | |
| 1096 } | |
| 1097 } | |
| 1098 | |
| 1099 if(ref[1] < 0){ | |
| 1100 *mb_type &= ~MB_TYPE_P0L1; | |
| 1101 sub_mb_type &= ~MB_TYPE_P0L1; | |
| 1102 }else if(ref[0] < 0){ | |
| 1103 *mb_type &= ~MB_TYPE_P0L0; | |
| 1104 sub_mb_type &= ~MB_TYPE_P0L0; | |
| 1105 } | |
| 1106 | |
| 1107 if(IS_16X16(*mb_type)){ | |
| 4540 | 1108 int a=0, b=0; |
| 1109 | |
|
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1110 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
|
1111 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1); |
| 2967 | 1112 if(!IS_INTRA(mb_type_col) |
| 4001 | 1113 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1) |
| 1114 || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 | |
| 2834 | 1115 && (h->x264_build>33 || !h->x264_build)))){ |
| 2396 | 1116 if(ref[0] > 0) |
| 4540 | 1117 a= pack16to32(mv[0][0],mv[0][1]); |
| 2396 | 1118 if(ref[1] > 0) |
| 4540 | 1119 b= pack16to32(mv[1][0],mv[1][1]); |
| 2396 | 1120 }else{ |
| 4540 | 1121 a= pack16to32(mv[0][0],mv[0][1]); |
| 1122 b= pack16to32(mv[1][0],mv[1][1]); | |
| 1123 } | |
| 1124 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4); | |
| 1125 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, b, 4); | |
| 2396 | 1126 }else{ |
| 1127 for(i8=0; i8<4; i8++){ | |
| 1128 const int x8 = i8&1; | |
| 1129 const int y8 = i8>>1; | |
| 2967 | 1130 |
| 2396 | 1131 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
| 1132 continue; | |
| 1133 h->sub_mb_type[i8] = sub_mb_type; | |
| 2967 | 1134 |
| 2396 | 1135 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); |
| 1136 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
|
1137 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
|
1138 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); |
| 2967 | 1139 |
| 2396 | 1140 /* col_zero_flag */ |
| 2967 | 1141 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0 |
| 1142 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0 | |
| 2834 | 1143 && (h->x264_build>33 || !h->x264_build)))){ |
|
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1144 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1; |
| 3002 | 1145 if(IS_SUB_8X8(sub_mb_type)){ |
| 1146 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
| 4001 | 1147 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
| 3002 | 1148 if(ref[0] == 0) |
| 1149 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1150 if(ref[1] == 0) | |
| 1151 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1152 } | |
| 1153 }else | |
| 2396 | 1154 for(i4=0; i4<4; i4++){ |
|
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1155 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
| 4001 | 1156 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
| 2396 | 1157 if(ref[0] == 0) |
| 1158 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
| 1159 if(ref[1] == 0) | |
| 1160 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
| 1161 } | |
| 1162 } | |
| 1163 } | |
| 1164 } | |
| 1165 } | |
| 1166 }else{ /* direct temporal mv pred */ | |
| 3316 | 1167 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; |
| 1168 const int *dist_scale_factor = h->dist_scale_factor; | |
| 1169 | |
| 1170 if(FRAME_MBAFF){ | |
| 1171 if(IS_INTERLACED(*mb_type)){ | |
| 1172 map_col_to_list0[0] = h->map_col_to_list0_field[0]; | |
| 1173 map_col_to_list0[1] = h->map_col_to_list0_field[1]; | |
| 1174 dist_scale_factor = h->dist_scale_factor_field; | |
| 1175 } | |
| 1176 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){ | |
| 1177 /* FIXME assumes direct_8x8_inference == 1 */ | |
| 1178 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride; | |
| 1179 int mb_types_col[2]; | |
| 1180 int y_shift; | |
| 1181 | |
| 1182 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1 | |
| 1183 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2) | |
| 1184 | (*mb_type & MB_TYPE_INTERLACED); | |
| 1185 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16; | |
| 1186 | |
| 1187 if(IS_INTERLACED(*mb_type)){ | |
| 1188 /* frame to field scaling */ | |
| 1189 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy]; | |
| 1190 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
| 1191 if(s->mb_y&1){ | |
| 1192 l1ref0 -= 2*h->b8_stride; | |
| 1193 l1ref1 -= 2*h->b8_stride; | |
| 1194 l1mv0 -= 4*h->b_stride; | |
| 1195 l1mv1 -= 4*h->b_stride; | |
| 1196 } | |
| 1197 y_shift = 0; | |
| 1198 | |
| 1199 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA) | |
| 1200 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA) | |
| 1201 && !is_b8x8) | |
| 1202 *mb_type |= MB_TYPE_16x8; | |
| 1203 else | |
| 1204 *mb_type |= MB_TYPE_8x8; | |
| 1205 }else{ | |
| 1206 /* field to frame scaling */ | |
| 1207 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1) | |
| 1208 * but in MBAFF, top and bottom POC are equal */ | |
| 1209 int dy = (s->mb_y&1) ? 1 : 2; | |
| 1210 mb_types_col[0] = | |
| 1211 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
| 1212 l1ref0 += dy*h->b8_stride; | |
| 1213 l1ref1 += dy*h->b8_stride; | |
| 1214 l1mv0 += 2*dy*h->b_stride; | |
| 1215 l1mv1 += 2*dy*h->b_stride; | |
| 1216 y_shift = 2; | |
| 1217 | |
| 1218 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8)) | |
| 1219 && !is_b8x8) | |
| 1220 *mb_type |= MB_TYPE_16x16; | |
| 1221 else | |
| 1222 *mb_type |= MB_TYPE_8x8; | |
| 1223 } | |
| 1224 | |
| 1225 for(i8=0; i8<4; i8++){ | |
| 1226 const int x8 = i8&1; | |
| 1227 const int y8 = i8>>1; | |
| 1228 int ref0, scale; | |
| 1229 const int16_t (*l1mv)[2]= l1mv0; | |
| 1230 | |
| 1231 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1232 continue; | |
| 1233 h->sub_mb_type[i8] = sub_mb_type; | |
| 1234 | |
| 1235 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1236 if(IS_INTRA(mb_types_col[y8])){ | |
| 1237 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1238 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1239 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1240 continue; | |
| 1241 } | |
| 1242 | |
| 1243 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride]; | |
| 1244 if(ref0 >= 0) | |
| 1245 ref0 = map_col_to_list0[0][ref0*2>>y_shift]; | |
| 1246 else{ | |
| 1247 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift]; | |
| 1248 l1mv= l1mv1; | |
| 1249 } | |
| 1250 scale = dist_scale_factor[ref0]; | |
| 1251 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
| 1252 | |
| 1253 { | |
| 1254 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride]; | |
| 1255 int my_col = (mv_col[1]<<y_shift)/2; | |
| 1256 int mx = (scale * mv_col[0] + 128) >> 8; | |
| 1257 int my = (scale * my_col + 128) >> 8; | |
| 1258 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); | |
| 1259 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4); | |
| 1260 } | |
| 1261 } | |
| 1262 return; | |
| 1263 } | |
| 1264 } | |
| 1265 | |
| 1266 /* one-to-one mv scaling */ | |
| 1267 | |
| 2396 | 1268 if(IS_16X16(*mb_type)){ |
| 4541 | 1269 int ref, mv0, mv1; |
| 1270 | |
| 2396 | 1271 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); |
| 1272 if(IS_INTRA(mb_type_col)){ | |
| 4541 | 1273 ref=mv0=mv1=0; |
| 2396 | 1274 }else{ |
| 3316 | 1275 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]] |
| 1276 : map_col_to_list0[1][l1ref1[0]]; | |
| 1277 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
|
1278 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; |
| 2396 | 1279 int mv_l0[2]; |
| 3316 | 1280 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
| 1281 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
| 4541 | 1282 ref= ref0; |
| 1283 mv0= pack16to32(mv_l0[0],mv_l0[1]); | |
| 1284 mv1= pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
| 1285 } | |
| 1286 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1); | |
| 1287 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, mv0, 4); | |
| 1288 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, mv1, 4); | |
| 2396 | 1289 }else{ |
| 1290 for(i8=0; i8<4; i8++){ | |
| 1291 const int x8 = i8&1; | |
| 1292 const int y8 = i8>>1; | |
| 3316 | 1293 int ref0, scale; |
| 2834 | 1294 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
|
1295 |
| 2396 | 1296 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
| 1297 continue; | |
| 1298 h->sub_mb_type[i8] = sub_mb_type; | |
| 3316 | 1299 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); |
| 2396 | 1300 if(IS_INTRA(mb_type_col)){ |
| 1301 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1302 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1303 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1304 continue; | |
| 1305 } | |
| 2967 | 1306 |
| 2396 | 1307 ref0 = l1ref0[x8 + y8*h->b8_stride]; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1308 if(ref0 >= 0) |
| 3316 | 1309 ref0 = map_col_to_list0[0][ref0]; |
|
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1310 else{ |
| 3316 | 1311 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
|
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1312 l1mv= l1mv1; |
|
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1313 } |
| 3316 | 1314 scale = dist_scale_factor[ref0]; |
| 2967 | 1315 |
| 2396 | 1316 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); |
| 3002 | 1317 if(IS_SUB_8X8(sub_mb_type)){ |
| 1318 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
| 3316 | 1319 int mx = (scale * mv_col[0] + 128) >> 8; |
| 1320 int my = (scale * mv_col[1] + 128) >> 8; | |
| 3002 | 1321 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); |
| 1322 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4); | |
| 1323 }else | |
| 2396 | 1324 for(i4=0; i4<4; i4++){ |
|
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1325 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
| 2396 | 1326 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; |
| 3316 | 1327 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
| 1328 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
| 2396 | 1329 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = |
| 1330 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
| 1331 } | |
| 1332 } | |
| 1333 } | |
| 1334 } | |
| 1335 } | |
| 1336 | |
| 1168 | 1337 static inline void write_back_motion(H264Context *h, int mb_type){ |
| 1338 MpegEncContext * const s = &h->s; | |
| 1339 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1340 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1341 int list; | |
| 1342 | |
|
3219
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1343 if(!USES_LIST(mb_type, 0)) |
|
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1344 fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, h->b8_stride, (uint8_t)LIST_NOT_USED, 1); |
|
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1345 |
| 4533 | 1346 for(list=0; list<h->list_count; list++){ |
| 1168 | 1347 int y; |
| 3212 | 1348 if(!USES_LIST(mb_type, list)) |
| 2396 | 1349 continue; |
| 2967 | 1350 |
| 1168 | 1351 for(y=0; y<4; y++){ |
| 1352 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y]; | |
| 1353 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y]; | |
| 1354 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1355 if( h->pps.cabac ) { |
| 3927 | 1356 if(IS_SKIP(mb_type)) |
| 1357 fill_rectangle(h->mvd_table[list][b_xy], 4, 4, h->b_stride, 0, 4); | |
| 1358 else | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1359 for(y=0; y<4; y++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1360 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1361 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1362 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1363 } |
| 3212 | 1364 |
| 1365 { | |
| 3776 | 1366 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; |
| 3212 | 1367 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]]; |
| 1368 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]]; | |
| 1369 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]]; | |
| 1370 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]]; | |
| 1168 | 1371 } |
| 1372 } | |
| 2967 | 1373 |
| 2396 | 1374 if(h->slice_type == B_TYPE && h->pps.cabac){ |
| 1375 if(IS_8X8(mb_type)){ | |
| 3212 | 1376 uint8_t *direct_table = &h->direct_table[b8_xy]; |
| 1377 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
| 1378 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
| 1379 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
| 2396 | 1380 } |
| 1381 } | |
| 1168 | 1382 } |
| 1383 | |
| 1384 /** | |
| 1385 * Decodes a network abstraction layer unit. | |
| 1386 * @param consumed is the number of bytes used as input | |
| 1387 * @param length is the length of the array | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1388 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
| 2967 | 1389 * @returns decoded bytes, might be src+1 if no escapes |
| 1168 | 1390 */ |
| 1391 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
| 1392 int i, si, di; | |
| 1393 uint8_t *dst; | |
| 5174 | 1394 int bufidx; |
| 1168 | 1395 |
| 2979 | 1396 // src[0]&0x80; //forbidden bit |
| 1168 | 1397 h->nal_ref_idc= src[0]>>5; |
| 1398 h->nal_unit_type= src[0]&0x1F; | |
| 1399 | |
| 1400 src++; length--; | |
| 2967 | 1401 #if 0 |
| 1168 | 1402 for(i=0; i<length; i++) |
| 1403 printf("%2X ", src[i]); | |
| 1404 #endif | |
| 1405 for(i=0; i+1<length; i+=2){ | |
| 1406 if(src[i]) continue; | |
| 1407 if(i>0 && src[i-1]==0) i--; | |
| 1408 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1409 if(src[i+2]!=3){ | |
| 1410 /* startcode, so we must be past the end */ | |
| 1411 length=i; | |
| 1412 } | |
| 1413 break; | |
| 1414 } | |
| 1415 } | |
| 1416 | |
| 1417 if(i>=length-1){ //no escaped 0 | |
| 1418 *dst_length= length; | |
| 1419 *consumed= length+1; //+1 for the header | |
| 2967 | 1420 return src; |
| 1168 | 1421 } |
| 1422 | |
| 5174 | 1423 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data |
| 1424 h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length); | |
| 1425 dst= h->rbsp_buffer[bufidx]; | |
| 1168 | 1426 |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1427 if (dst == NULL){ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1428 return NULL; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1429 } |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1430 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1431 //printf("decoding esc\n"); |
| 1168 | 1432 si=di=0; |
| 2967 | 1433 while(si<length){ |
| 1168 | 1434 //remove escapes (very rare 1:2^22) |
| 1435 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1436 if(src[si+2]==3){ //escape | |
| 1437 dst[di++]= 0; | |
| 1438 dst[di++]= 0; | |
| 1439 si+=3; | |
|
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1440 continue; |
| 1168 | 1441 }else //next start code |
| 1442 break; | |
| 1443 } | |
| 1444 | |
| 1445 dst[di++]= src[si++]; | |
| 1446 } | |
| 1447 | |
| 1448 *dst_length= di; | |
| 1449 *consumed= si + 1;//+1 for the header | |
| 5129 | 1450 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding) |
| 1168 | 1451 return dst; |
| 1452 } | |
| 1453 | |
| 1454 /** | |
| 1455 * identifies the exact end of the bitstream | |
| 1456 * @return the length of the trailing, or 0 if damaged | |
| 1457 */ | |
| 4600 | 1458 static int decode_rbsp_trailing(H264Context *h, uint8_t *src){ |
| 1168 | 1459 int v= *src; |
| 1460 int r; | |
| 1461 | |
| 4600 | 1462 tprintf(h->s.avctx, "rbsp trailing %X\n", v); |
| 1168 | 1463 |
| 1464 for(r=1; r<9; r++){ | |
| 1465 if(v&1) return r; | |
| 1466 v>>=1; | |
| 1467 } | |
| 1468 return 0; | |
| 1469 } | |
| 1470 | |
| 1471 /** | |
| 1472 * idct tranforms the 16 dc values and dequantize them. | |
| 1473 * @param qp quantization parameter | |
| 1474 */ | |
| 2919 | 1475 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
| 1168 | 1476 #define stride 16 |
| 1477 int i; | |
| 1478 int temp[16]; //FIXME check if this is a good idea | |
| 1479 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1480 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1481 | |
| 1482 //memset(block, 64, 2*256); | |
| 1483 //return; | |
| 1484 for(i=0; i<4; i++){ | |
| 1485 const int offset= y_offset[i]; | |
| 1486 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1487 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1488 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1489 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1490 | |
| 1491 temp[4*i+0]= z0+z3; | |
| 1492 temp[4*i+1]= z1+z2; | |
| 1493 temp[4*i+2]= z1-z2; | |
| 1494 temp[4*i+3]= z0-z3; | |
| 1495 } | |
| 1496 | |
| 1497 for(i=0; i<4; i++){ | |
| 1498 const int offset= x_offset[i]; | |
| 1499 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1500 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1501 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1502 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1503 | |
| 2919 | 1504 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_resdual |
| 1505 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8)); | |
| 1506 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8)); | |
| 1507 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8)); | |
| 1168 | 1508 } |
| 1509 } | |
| 1510 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1511 #if 0 |
| 1168 | 1512 /** |
| 1513 * dct tranforms the 16 dc values. | |
| 1514 * @param qp quantization parameter ??? FIXME | |
| 1515 */ | |
| 1516 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
| 1517 // const int qmul= dequant_coeff[qp][0]; | |
| 1518 int i; | |
| 1519 int temp[16]; //FIXME check if this is a good idea | |
| 1520 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1521 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1522 | |
| 1523 for(i=0; i<4; i++){ | |
| 1524 const int offset= y_offset[i]; | |
| 1525 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1526 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1527 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1528 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1529 | |
| 1530 temp[4*i+0]= z0+z3; | |
| 1531 temp[4*i+1]= z1+z2; | |
| 1532 temp[4*i+2]= z1-z2; | |
| 1533 temp[4*i+3]= z0-z3; | |
| 1534 } | |
| 1535 | |
| 1536 for(i=0; i<4; i++){ | |
| 1537 const int offset= x_offset[i]; | |
| 1538 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1539 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1540 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1541 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1542 | |
| 1543 block[stride*0 +offset]= (z0 + z3)>>1; | |
| 1544 block[stride*2 +offset]= (z1 + z2)>>1; | |
| 1545 block[stride*8 +offset]= (z1 - z2)>>1; | |
| 1546 block[stride*10+offset]= (z0 - z3)>>1; | |
| 1547 } | |
| 1548 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1549 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1550 |
| 1168 | 1551 #undef xStride |
| 1552 #undef stride | |
| 1553 | |
| 2919 | 1554 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
| 1168 | 1555 const int stride= 16*2; |
| 1556 const int xStride= 16; | |
| 1557 int a,b,c,d,e; | |
| 1558 | |
| 1559 a= block[stride*0 + xStride*0]; | |
| 1560 b= block[stride*0 + xStride*1]; | |
| 1561 c= block[stride*1 + xStride*0]; | |
| 1562 d= block[stride*1 + xStride*1]; | |
| 1563 | |
| 1564 e= a-b; | |
| 1565 a= a+b; | |
| 1566 b= c-d; | |
| 1567 c= c+d; | |
| 1568 | |
| 2919 | 1569 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7; |
| 1570 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7; | |
| 1571 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7; | |
| 1572 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7; | |
| 1168 | 1573 } |
| 1574 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1575 #if 0 |
| 1168 | 1576 static void chroma_dc_dct_c(DCTELEM *block){ |
| 1577 const int stride= 16*2; | |
| 1578 const int xStride= 16; | |
| 1579 int a,b,c,d,e; | |
| 1580 | |
| 1581 a= block[stride*0 + xStride*0]; | |
| 1582 b= block[stride*0 + xStride*1]; | |
| 1583 c= block[stride*1 + xStride*0]; | |
| 1584 d= block[stride*1 + xStride*1]; | |
| 1585 | |
| 1586 e= a-b; | |
| 1587 a= a+b; | |
| 1588 b= c-d; | |
| 1589 c= c+d; | |
| 1590 | |
| 1591 block[stride*0 + xStride*0]= (a+c); | |
| 1592 block[stride*0 + xStride*1]= (e+b); | |
| 1593 block[stride*1 + xStride*0]= (a-c); | |
| 1594 block[stride*1 + xStride*1]= (e-b); | |
| 1595 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1596 #endif |
| 1168 | 1597 |
| 1598 /** | |
| 1599 * gets the chroma qp. | |
| 1600 */ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1601 static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){ |
| 2967 | 1602 |
| 4594 | 1603 return chroma_qp[av_clip(qscale + chroma_qp_index_offset, 0, 51)]; |
| 1168 | 1604 } |
| 1605 | |
| 5127 | 1606 //FIXME need to check that this does not overflow signed 32 bit for low qp, i am not sure, it's very close |
|
4553
1a714d3f0233
cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents:
4546
diff
changeset
|
1607 //FIXME check that gcc inlines this (and optimizes intra & separate_dc stuff away) |
|
1a714d3f0233
cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents:
4546
diff
changeset
|
1608 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){ |
| 1168 | 1609 int i; |
| 1610 const int * const quant_table= quant_coeff[qscale]; | |
| 1611 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1612 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1613 const unsigned int threshold2= (threshold1<<1); | |
| 1614 int last_non_zero; | |
| 1615 | |
|
4553
1a714d3f0233
cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents:
4546
diff
changeset
|
1616 if(separate_dc){ |
| 1168 | 1617 if(qscale<=18){ |
| 1618 //avoid overflows | |
| 1619 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1620 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1621 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1622 | |
| 1623 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1624 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1625 if(level>0){ | |
| 1626 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1627 block[0]= level; | |
| 1628 }else{ | |
| 1629 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1630 block[0]= -level; | |
| 1631 } | |
| 1632 // last_non_zero = i; | |
| 1633 }else{ | |
| 1634 block[0]=0; | |
| 1635 } | |
| 1636 }else{ | |
| 1637 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1638 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1639 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1640 | |
| 1641 int level= block[0]*quant_table[0]; | |
| 1642 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1643 if(level>0){ | |
| 1644 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1645 block[0]= level; | |
| 1646 }else{ | |
| 1647 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1648 block[0]= -level; | |
| 1649 } | |
| 1650 // last_non_zero = i; | |
| 1651 }else{ | |
| 1652 block[0]=0; | |
| 1653 } | |
| 1654 } | |
| 1655 last_non_zero= 0; | |
| 1656 i=1; | |
| 1657 }else{ | |
| 1658 last_non_zero= -1; | |
| 1659 i=0; | |
| 1660 } | |
| 1661 | |
| 1662 for(; i<16; i++){ | |
| 1663 const int j= scantable[i]; | |
| 1664 int level= block[j]*quant_table[j]; | |
| 1665 | |
| 1666 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1667 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1668 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1669 if(level>0){ | |
| 1670 level= (bias + level)>>QUANT_SHIFT; | |
| 1671 block[j]= level; | |
| 1672 }else{ | |
| 1673 level= (bias - level)>>QUANT_SHIFT; | |
| 1674 block[j]= -level; | |
| 1675 } | |
| 1676 last_non_zero = i; | |
| 1677 }else{ | |
| 1678 block[j]=0; | |
| 1679 } | |
| 1680 } | |
| 1681 | |
| 1682 return last_non_zero; | |
| 1683 } | |
| 1684 | |
| 1685 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1686 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1687 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1688 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1689 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1690 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1691 } | |
| 1692 | |
| 1693 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1694 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1695 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1696 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1697 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1698 } | |
| 1699 | |
| 1700 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1701 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1702 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 2967 | 1703 |
| 1704 ((uint32_t*)(src+0*stride))[0]= | |
| 1705 ((uint32_t*)(src+1*stride))[0]= | |
| 1706 ((uint32_t*)(src+2*stride))[0]= | |
| 1707 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1708 } |
| 1709 | |
| 1710 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1711 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 2967 | 1712 |
| 1713 ((uint32_t*)(src+0*stride))[0]= | |
| 1714 ((uint32_t*)(src+1*stride))[0]= | |
| 1715 ((uint32_t*)(src+2*stride))[0]= | |
| 1716 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1717 } |
| 1718 | |
| 1719 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1720 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 2967 | 1721 |
| 1722 ((uint32_t*)(src+0*stride))[0]= | |
| 1723 ((uint32_t*)(src+1*stride))[0]= | |
| 1724 ((uint32_t*)(src+2*stride))[0]= | |
| 1725 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1726 } |
| 1727 | |
| 1728 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1729 ((uint32_t*)(src+0*stride))[0]= |
| 1730 ((uint32_t*)(src+1*stride))[0]= | |
| 1731 ((uint32_t*)(src+2*stride))[0]= | |
| 1168 | 1732 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; |
| 1733 } | |
| 1734 | |
| 1735 | |
| 1736 #define LOAD_TOP_RIGHT_EDGE\ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1737 const int av_unused t4= topright[0];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1738 const int av_unused t5= topright[1];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1739 const int av_unused t6= topright[2];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1740 const int av_unused t7= topright[3];\ |
| 1168 | 1741 |
| 1742 #define LOAD_LEFT_EDGE\ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1743 const int av_unused l0= src[-1+0*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1744 const int av_unused l1= src[-1+1*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1745 const int av_unused l2= src[-1+2*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1746 const int av_unused l3= src[-1+3*stride];\ |
| 1168 | 1747 |
| 1748 #define LOAD_TOP_EDGE\ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1749 const int av_unused t0= src[ 0-1*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1750 const int av_unused t1= src[ 1-1*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1751 const int av_unused t2= src[ 2-1*stride];\ |
|
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1752 const int av_unused t3= src[ 3-1*stride];\ |
| 1168 | 1753 |
| 1754 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1755 const int lt= src[-1-1*stride]; | |
| 1756 LOAD_TOP_EDGE | |
| 1757 LOAD_LEFT_EDGE | |
| 1758 | |
| 2967 | 1759 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; |
| 1168 | 1760 src[0+2*stride]= |
| 2967 | 1761 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; |
| 1168 | 1762 src[0+1*stride]= |
| 1763 src[1+2*stride]= | |
| 2967 | 1764 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; |
| 1168 | 1765 src[0+0*stride]= |
| 1766 src[1+1*stride]= | |
| 1767 src[2+2*stride]= | |
| 2967 | 1768 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; |
| 1168 | 1769 src[1+0*stride]= |
| 1770 src[2+1*stride]= | |
| 1771 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1772 src[2+0*stride]= | |
| 1773 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1774 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1775 } |
| 1168 | 1776 |
| 1777 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1778 LOAD_TOP_EDGE |
| 1779 LOAD_TOP_RIGHT_EDGE | |
| 1780 // LOAD_LEFT_EDGE | |
| 1168 | 1781 |
| 1782 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1783 src[1+0*stride]= | |
| 1784 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1785 src[2+0*stride]= | |
| 1786 src[1+1*stride]= | |
| 1787 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1788 src[3+0*stride]= | |
| 1789 src[2+1*stride]= | |
| 1790 src[1+2*stride]= | |
| 1791 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1792 src[3+1*stride]= | |
| 1793 src[2+2*stride]= | |
| 1794 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1795 src[3+2*stride]= | |
| 1796 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1797 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1798 } |
| 1168 | 1799 |
| 1800 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1801 const int lt= src[-1-1*stride]; | |
| 2967 | 1802 LOAD_TOP_EDGE |
| 1803 LOAD_LEFT_EDGE | |
| 1168 | 1804 |
| 1805 src[0+0*stride]= | |
| 1806 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1807 src[1+0*stride]= | |
| 1808 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1809 src[2+0*stride]= | |
| 1810 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1811 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1812 src[0+1*stride]= | |
| 1813 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1814 src[1+1*stride]= | |
| 1815 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1816 src[2+1*stride]= | |
| 1817 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1818 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1819 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1820 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1821 } |
| 1168 | 1822 |
| 1823 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1824 LOAD_TOP_EDGE |
| 1825 LOAD_TOP_RIGHT_EDGE | |
| 1168 | 1826 |
| 1827 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1828 src[1+0*stride]= | |
| 1829 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1830 src[2+0*stride]= | |
| 1831 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1832 src[3+0*stride]= | |
| 1833 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1834 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1835 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1836 src[1+1*stride]= | |
| 1837 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1838 src[2+1*stride]= | |
| 1839 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1840 src[3+1*stride]= | |
| 1841 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1842 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1843 } |
| 1168 | 1844 |
| 1845 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1846 LOAD_LEFT_EDGE |
| 1168 | 1847 |
| 1848 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 1849 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1850 src[2+0*stride]= | |
| 1851 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 1852 src[3+0*stride]= | |
| 1853 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1854 src[2+1*stride]= | |
| 1855 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 1856 src[3+1*stride]= | |
| 1857 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 1858 src[3+2*stride]= | |
| 1859 src[1+3*stride]= | |
| 1860 src[0+3*stride]= | |
| 1861 src[2+2*stride]= | |
| 1862 src[2+3*stride]= | |
| 1863 src[3+3*stride]=l3; | |
| 1282 | 1864 } |
| 2967 | 1865 |
| 1168 | 1866 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ |
| 1867 const int lt= src[-1-1*stride]; | |
| 2967 | 1868 LOAD_TOP_EDGE |
| 1869 LOAD_LEFT_EDGE | |
| 1168 | 1870 |
| 1871 src[0+0*stride]= | |
| 1872 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 1873 src[1+0*stride]= | |
| 1874 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1875 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1876 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1877 src[0+1*stride]= | |
| 1878 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 1879 src[1+1*stride]= | |
| 1880 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1881 src[0+2*stride]= | |
| 1882 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 1883 src[1+2*stride]= | |
| 1884 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1885 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 1886 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 1887 } |
| 1168 | 1888 |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1889 void ff_pred16x16_vertical_c(uint8_t *src, int stride){ |
| 1168 | 1890 int i; |
| 1891 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1892 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 1893 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 1894 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 2967 | 1895 |
| 1168 | 1896 for(i=0; i<16; i++){ |
| 1897 ((uint32_t*)(src+i*stride))[0]= a; | |
| 1898 ((uint32_t*)(src+i*stride))[1]= b; | |
| 1899 ((uint32_t*)(src+i*stride))[2]= c; | |
| 1900 ((uint32_t*)(src+i*stride))[3]= d; | |
| 1901 } | |
| 1902 } | |
| 1903 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1904 void ff_pred16x16_horizontal_c(uint8_t *src, int stride){ |
| 1168 | 1905 int i; |
| 1906 | |
| 1907 for(i=0; i<16; i++){ | |
| 1908 ((uint32_t*)(src+i*stride))[0]= | |
| 1909 ((uint32_t*)(src+i*stride))[1]= | |
| 1910 ((uint32_t*)(src+i*stride))[2]= | |
| 1911 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 1912 } | |
| 1913 } | |
| 1914 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1915 void ff_pred16x16_dc_c(uint8_t *src, int stride){ |
| 1168 | 1916 int i, dc=0; |
| 1917 | |
| 1918 for(i=0;i<16; i++){ | |
| 1919 dc+= src[-1+i*stride]; | |
| 1920 } | |
| 2967 | 1921 |
| 1168 | 1922 for(i=0;i<16; i++){ |
| 1923 dc+= src[i-stride]; | |
| 1924 } | |
| 1925 | |
| 1926 dc= 0x01010101*((dc + 16)>>5); | |
| 1927 | |
| 1928 for(i=0; i<16; i++){ | |
| 1929 ((uint32_t*)(src+i*stride))[0]= | |
| 1930 ((uint32_t*)(src+i*stride))[1]= | |
| 1931 ((uint32_t*)(src+i*stride))[2]= | |
| 1932 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1933 } | |
| 1934 } | |
| 1935 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
1936 void ff_pred16x16_left_dc_c(uint8_t *src, int stride){ |
| 1168 | 1937 int i, dc=0; |
| 1938 | |
| 1939 for(i=0;i<16; i++){ | |
| 1940 dc+= src[-1+i*stride]; | |
| 1941 } | |
| 2967 | 1942 |
| 1168 | 1943 dc= 0x01010101*((dc + 8)>>4); |
| 1944 | |
| 1945 for(i=0; i<16; i++){ | |
| 1946 ((uint32_t*)(src+i*stride))[0]= | |
| 1947 ((uint32_t*)(src+i*stride))[1]= | |
| 1948 ((uint32_t*)(src+i*stride))[2]= | |
| 1949 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1950 } | |
| 1951 } | |
| 1952 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
1953 void ff_pred16x16_top_dc_c(uint8_t *src, int stride){ |
| 1168 | 1954 int i, dc=0; |
| 1955 | |
| 1956 for(i=0;i<16; i++){ | |
| 1957 dc+= src[i-stride]; | |
| 1958 } | |
| 1959 dc= 0x01010101*((dc + 8)>>4); | |
| 1960 | |
| 1961 for(i=0; i<16; i++){ | |
| 1962 ((uint32_t*)(src+i*stride))[0]= | |
| 1963 ((uint32_t*)(src+i*stride))[1]= | |
| 1964 ((uint32_t*)(src+i*stride))[2]= | |
| 1965 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1966 } | |
| 1967 } | |
| 1968 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1969 void ff_pred16x16_128_dc_c(uint8_t *src, int stride){ |
| 1168 | 1970 int i; |
| 1971 | |
| 1972 for(i=0; i<16; i++){ | |
| 1973 ((uint32_t*)(src+i*stride))[0]= | |
| 1974 ((uint32_t*)(src+i*stride))[1]= | |
| 1975 ((uint32_t*)(src+i*stride))[2]= | |
| 1976 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 1977 } | |
| 1978 } | |
| 1979 | |
| 1234 | 1980 static inline void pred16x16_plane_compat_c(uint8_t *src, int stride, const int svq3){ |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1981 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1982 int a; |
| 4176 | 1983 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1984 const uint8_t * const src0 = src+7-stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1985 const uint8_t *src1 = src+8*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1986 const uint8_t *src2 = src1-2*stride; // == src+6*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1987 int H = src0[1] - src0[-1]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1988 int V = src1[0] - src2[ 0]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1989 for(k=2; k<=8; ++k) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1990 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1991 H += k*(src0[k] - src0[-k]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1992 V += k*(src1[0] - src2[ 0]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1993 } |
| 1234 | 1994 if(svq3){ |
| 1995 H = ( 5*(H/4) ) / 16; | |
| 1996 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1997 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1998 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1999 i = H; H = V; V = i; |
| 1234 | 2000 }else{ |
| 2001 H = ( 5*H+32 ) >> 6; | |
| 2002 V = ( 5*V+32 ) >> 6; | |
| 2003 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2004 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2005 a = 16*(src1[0] + src2[16] + 1) - 7*(V+H); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2006 for(j=16; j>0; --j) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2007 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2008 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2009 for(i=-16; i<0; i+=4) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2010 src[16+i] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2011 src[17+i] = cm[ (b+ H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2012 src[18+i] = cm[ (b+2*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2013 src[19+i] = cm[ (b+3*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2014 b += 4*H; |
| 1168 | 2015 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2016 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2017 } |
| 1168 | 2018 } |
| 2019 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2020 void ff_pred16x16_plane_c(uint8_t *src, int stride){ |
| 1234 | 2021 pred16x16_plane_compat_c(src, stride, 0); |
| 2022 } | |
| 2023 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2024 void ff_pred8x8_vertical_c(uint8_t *src, int stride){ |
| 1168 | 2025 int i; |
| 2026 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2027 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2967 | 2028 |
| 1168 | 2029 for(i=0; i<8; i++){ |
| 2030 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2031 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2032 } | |
| 2033 } | |
| 2034 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2035 void ff_pred8x8_horizontal_c(uint8_t *src, int stride){ |
| 1168 | 2036 int i; |
| 2037 | |
| 2038 for(i=0; i<8; i++){ | |
| 2039 ((uint32_t*)(src+i*stride))[0]= | |
| 2040 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 2041 } | |
| 2042 } | |
| 2043 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2044 void ff_pred8x8_128_dc_c(uint8_t *src, int stride){ |
| 1168 | 2045 int i; |
| 2046 | |
| 2755 | 2047 for(i=0; i<8; i++){ |
| 2967 | 2048 ((uint32_t*)(src+i*stride))[0]= |
| 1168 | 2049 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; |
| 2050 } | |
| 2051 } | |
| 2052 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2053 void ff_pred8x8_left_dc_c(uint8_t *src, int stride){ |
| 1168 | 2054 int i; |
| 2055 int dc0, dc2; | |
| 2056 | |
| 2057 dc0=dc2=0; | |
| 2058 for(i=0;i<4; i++){ | |
| 2059 dc0+= src[-1+i*stride]; | |
| 2060 dc2+= src[-1+(i+4)*stride]; | |
| 2061 } | |
| 2062 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2063 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2064 | |
| 2065 for(i=0; i<4; i++){ | |
| 2066 ((uint32_t*)(src+i*stride))[0]= | |
| 2067 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 2068 } | |
| 2069 for(i=4; i<8; i++){ | |
| 2070 ((uint32_t*)(src+i*stride))[0]= | |
| 2071 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 2072 } | |
| 2073 } | |
| 2074 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2075 void ff_pred8x8_top_dc_c(uint8_t *src, int stride){ |
| 1168 | 2076 int i; |
| 2077 int dc0, dc1; | |
| 2078 | |
| 2079 dc0=dc1=0; | |
| 2080 for(i=0;i<4; i++){ | |
| 2081 dc0+= src[i-stride]; | |
| 2082 dc1+= src[4+i-stride]; | |
| 2083 } | |
| 2084 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2085 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2086 | |
| 2087 for(i=0; i<4; i++){ | |
| 2088 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2089 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2090 } | |
| 2091 for(i=4; i<8; i++){ | |
| 2092 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2093 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2094 } | |
| 2095 } | |
| 2096 | |
| 2097 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2098 void ff_pred8x8_dc_c(uint8_t *src, int stride){ |
| 1168 | 2099 int i; |
| 2100 int dc0, dc1, dc2, dc3; | |
| 2101 | |
| 2102 dc0=dc1=dc2=0; | |
| 2103 for(i=0;i<4; i++){ | |
| 2104 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 2105 dc1+= src[4+i-stride]; | |
| 2106 dc2+= src[-1+(i+4)*stride]; | |
| 2107 } | |
| 2108 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 2109 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 2110 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2111 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2112 | |
| 2113 for(i=0; i<4; i++){ | |
| 2114 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2115 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2116 } | |
| 2117 for(i=4; i<8; i++){ | |
| 2118 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 2119 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 2120 } | |
| 2121 } | |
| 2122 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2123 void ff_pred8x8_plane_c(uint8_t *src, int stride){ |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2124 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2125 int a; |
| 4176 | 2126 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2127 const uint8_t * const src0 = src+3-stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2128 const uint8_t *src1 = src+4*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2129 const uint8_t *src2 = src1-2*stride; // == src+2*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2130 int H = src0[1] - src0[-1]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2131 int V = src1[0] - src2[ 0]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2132 for(k=2; k<=4; ++k) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2133 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2134 H += k*(src0[k] - src0[-k]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2135 V += k*(src1[0] - src2[ 0]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2136 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2137 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2138 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2139 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2140 a = 16*(src1[0] + src2[8]+1) - 3*(V+H); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2141 for(j=8; j>0; --j) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2142 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2143 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2144 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2145 src[1] = cm[ (b+ H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2146 src[2] = cm[ (b+2*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2147 src[3] = cm[ (b+3*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2148 src[4] = cm[ (b+4*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2149 src[5] = cm[ (b+5*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2150 src[6] = cm[ (b+6*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2151 src[7] = cm[ (b+7*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2152 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2153 } |
| 1168 | 2154 } |
| 2155 | |
| 2755 | 2156 #define SRC(x,y) src[(x)+(y)*stride] |
| 2157 #define PL(y) \ | |
| 2158 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; | |
| 2159 #define PREDICT_8x8_LOAD_LEFT \ | |
| 2160 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ | |
| 2161 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ | |
| 2162 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
2163 const int l7 av_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 |
| 2755 | 2164 |
| 2165 #define PT(x) \ | |
| 2166 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2167 #define PREDICT_8x8_LOAD_TOP \ | |
| 2168 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ | |
| 2169 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ | |
| 2170 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
2171 const int t7 av_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ |
| 2757 | 2172 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 |
| 2755 | 2173 |
| 2174 #define PTR(x) \ | |
| 2175 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2176 #define PREDICT_8x8_LOAD_TOPRIGHT \ | |
| 2177 int t8, t9, t10, t11, t12, t13, t14, t15; \ | |
| 2178 if(has_topright) { \ | |
| 2179 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \ | |
| 2180 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \ | |
| 2181 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1); | |
| 2182 | |
| 2183 #define PREDICT_8x8_LOAD_TOPLEFT \ | |
| 2757 | 2184 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2 |
| 2755 | 2185 |
| 2186 #define PREDICT_8x8_DC(v) \ | |
| 2187 int y; \ | |
| 2188 for( y = 0; y < 8; y++ ) { \ | |
| 2189 ((uint32_t*)src)[0] = \ | |
| 2190 ((uint32_t*)src)[1] = v; \ | |
| 2191 src += stride; \ | |
| 2192 } | |
| 2193 | |
| 2194 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2195 { | |
| 2196 PREDICT_8x8_DC(0x80808080); | |
| 2197 } | |
| 2198 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2199 { | |
| 2200 PREDICT_8x8_LOAD_LEFT; | |
| 2201 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101; | |
| 2202 PREDICT_8x8_DC(dc); | |
| 2203 } | |
| 2204 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2205 { | |
| 2206 PREDICT_8x8_LOAD_TOP; | |
| 2207 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101; | |
| 2208 PREDICT_8x8_DC(dc); | |
| 2209 } | |
| 2210 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2211 { | |
| 2212 PREDICT_8x8_LOAD_LEFT; | |
| 2213 PREDICT_8x8_LOAD_TOP; | |
| 2214 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7 | |
| 2215 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101; | |
| 2216 PREDICT_8x8_DC(dc); | |
| 2217 } | |
| 2218 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2219 { | |
| 2220 PREDICT_8x8_LOAD_LEFT; | |
| 2221 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\ | |
| 2222 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y | |
| 2223 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7); | |
| 2224 #undef ROW | |
| 2225 } | |
| 2226 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2227 { | |
| 2228 int y; | |
| 2229 PREDICT_8x8_LOAD_TOP; | |
| 2230 src[0] = t0; | |
| 2231 src[1] = t1; | |
| 2232 src[2] = t2; | |
| 2233 src[3] = t3; | |
| 2234 src[4] = t4; | |
| 2235 src[5] = t5; | |
| 2236 src[6] = t6; | |
| 2237 src[7] = t7; | |
| 2238 for( y = 1; y < 8; y++ ) | |
| 2239 *(uint64_t*)(src+y*stride) = *(uint64_t*)src; | |
| 2240 } | |
| 2241 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2242 { | |
| 2243 PREDICT_8x8_LOAD_TOP; | |
| 2244 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2245 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2246 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2247 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2248 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2249 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2250 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2251 SRC(0,6)=SRC(1,5)=SRC(2,4)=SRC(3,3)=SRC(4,2)=SRC(5,1)=SRC(6,0)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2252 SRC(0,7)=SRC(1,6)=SRC(2,5)=SRC(3,4)=SRC(4,3)=SRC(5,2)=SRC(6,1)=SRC(7,0)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2253 SRC(1,7)=SRC(2,6)=SRC(3,5)=SRC(4,4)=SRC(5,3)=SRC(6,2)=SRC(7,1)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2254 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2255 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2256 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2; | |
| 2257 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2; | |
| 2258 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2; | |
| 2259 SRC(7,7)= (t14 + 3*t15 + 2) >> 2; | |
| 2260 } | |
| 2261 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2262 { | |
| 2263 PREDICT_8x8_LOAD_TOP; | |
| 2264 PREDICT_8x8_LOAD_LEFT; | |
| 2265 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2266 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2; | |
| 2267 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2268 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2269 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2270 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2271 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2272 SRC(0,1)=SRC(1,2)=SRC(2,3)=SRC(3,4)=SRC(4,5)=SRC(5,6)=SRC(6,7)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2273 SRC(0,0)=SRC(1,1)=SRC(2,2)=SRC(3,3)=SRC(4,4)=SRC(5,5)=SRC(6,6)=SRC(7,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2274 SRC(1,0)=SRC(2,1)=SRC(3,2)=SRC(4,3)=SRC(5,4)=SRC(6,5)=SRC(7,6)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2275 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2276 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2277 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2278 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2279 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2280 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2967 | 2281 |
| 2755 | 2282 } |
| 2283 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2284 { | |
| 2285 PREDICT_8x8_LOAD_TOP; | |
| 2286 PREDICT_8x8_LOAD_LEFT; | |
| 2287 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2288 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2289 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2290 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2291 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2292 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2293 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2294 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2295 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1; | |
| 2296 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2297 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1; | |
| 2298 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2299 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1; | |
| 2300 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2301 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1; | |
| 2302 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2303 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1; | |
| 2304 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2305 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1; | |
| 2306 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2307 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1; | |
| 2308 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2309 SRC(7,0)= (t6 + t7 + 1) >> 1; | |
| 2310 } | |
| 2311 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2312 { | |
| 2313 PREDICT_8x8_LOAD_TOP; | |
| 2314 PREDICT_8x8_LOAD_LEFT; | |
| 2315 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2316 SRC(0,7)= (l6 + l7 + 1) >> 1; | |
| 2317 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2318 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1; | |
| 2319 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2320 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1; | |
| 2321 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2322 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1; | |
| 2323 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2324 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1; | |
| 2325 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2326 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1; | |
| 2327 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2328 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1; | |
| 2329 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2; | |
| 2330 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1; | |
| 2331 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2332 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2; | |
| 2333 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2; | |
| 2334 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2; | |
| 2335 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2; | |
| 2336 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2; | |
| 2337 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2; | |
| 2338 } | |
| 2339 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2340 { | |
| 2341 PREDICT_8x8_LOAD_TOP; | |
| 2342 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2343 SRC(0,0)= (t0 + t1 + 1) >> 1; | |
| 2344 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2345 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1; | |
| 2346 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2347 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1; | |
| 2348 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2349 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1; | |
| 2350 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2351 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1; | |
| 2352 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2353 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1; | |
| 2354 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2355 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1; | |
| 2356 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2357 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1; | |
| 2358 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2359 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1; | |
| 2360 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2361 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1; | |
| 2362 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2363 SRC(7,6)= (t10 + t11 + 1) >> 1; | |
| 2364 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2365 } | |
| 2366 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2367 { | |
| 2368 PREDICT_8x8_LOAD_LEFT; | |
| 2369 SRC(0,0)= (l0 + l1 + 1) >> 1; | |
| 2370 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2371 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1; | |
| 2372 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2373 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1; | |
| 2374 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2375 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1; | |
| 2376 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2377 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1; | |
| 2378 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2379 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1; | |
| 2380 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2381 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1; | |
| 2382 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2; | |
| 2383 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)= | |
| 2384 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)= | |
| 2385 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)= | |
| 2386 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7; | |
| 2387 } | |
| 2388 #undef PREDICT_8x8_LOAD_LEFT | |
| 2389 #undef PREDICT_8x8_LOAD_TOP | |
| 2390 #undef PREDICT_8x8_LOAD_TOPLEFT | |
| 2391 #undef PREDICT_8x8_LOAD_TOPRIGHT | |
| 2392 #undef PREDICT_8x8_DC | |
| 2393 #undef PTR | |
| 2394 #undef PT | |
| 2395 #undef PL | |
| 2396 #undef SRC | |
| 2397 | |
| 1168 | 2398 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, |
| 2399 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2400 int src_x_offset, int src_y_offset, | |
| 2401 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 2402 MpegEncContext * const s = &h->s; | |
| 2403 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 3316 | 2404 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; |
| 1168 | 2405 const int luma_xy= (mx&3) + ((my&3)<<2); |
| 3316 | 2406 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize; |
| 2407 uint8_t * src_cb, * src_cr; | |
| 2408 int extra_width= h->emu_edge_width; | |
| 2409 int extra_height= h->emu_edge_height; | |
| 1168 | 2410 int emu=0; |
| 2411 const int full_mx= mx>>2; | |
| 2412 const int full_my= my>>2; | |
|
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2413 const int pic_width = 16*s->mb_width; |
| 3316 | 2414 const int pic_height = 16*s->mb_height >> MB_MBAFF; |
| 2967 | 2415 |
| 4390 | 2416 if(!pic->data[0]) //FIXME this is unacceptable, some senseable error concealment must be done for missing reference frames |
| 3125 | 2417 return; |
| 2967 | 2418 |
| 1168 | 2419 if(mx&7) extra_width -= 3; |
| 2420 if(my&7) extra_height -= 3; | |
| 2967 | 2421 |
| 2422 if( full_mx < 0-extra_width | |
| 2423 || full_my < 0-extra_height | |
| 2424 || full_mx + 16/*FIXME*/ > pic_width + extra_width | |
|
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2425 || full_my + 16/*FIXME*/ > pic_height + extra_height){ |
| 3316 | 2426 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height); |
| 2427 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize; | |
| 1168 | 2428 emu=1; |
| 2429 } | |
| 2967 | 2430 |
| 3316 | 2431 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps? |
| 1168 | 2432 if(!square){ |
| 3316 | 2433 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize); |
| 1168 | 2434 } |
| 2967 | 2435 |
| 1168 | 2436 if(s->flags&CODEC_FLAG_GRAY) return; |
| 2967 | 2437 |
| 3316 | 2438 if(MB_MBAFF){ |
| 2439 // chroma offset when predicting from a field of opposite parity | |
| 2440 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1)); | |
| 2441 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); | |
| 2442 } | |
| 2443 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
| 2444 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
| 1168 | 2445 |
| 2446 if(emu){ | |
| 3316 | 2447 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); |
| 2448 src_cb= s->edge_emu_buffer; | |
| 2449 } | |
| 2450 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7); | |
| 2451 | |
| 2452 if(emu){ | |
| 2453 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); | |
| 1168 | 2454 src_cr= s->edge_emu_buffer; |
| 2455 } | |
| 3316 | 2456 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7); |
| 1168 | 2457 } |
| 2458 | |
| 2415 | 2459 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
| 1168 | 2460 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2461 int x_offset, int y_offset, | |
| 2462 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2463 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2464 int list0, int list1){ | |
| 2465 MpegEncContext * const s = &h->s; | |
| 2466 qpel_mc_func *qpix_op= qpix_put; | |
| 2467 h264_chroma_mc_func chroma_op= chroma_put; | |
| 2967 | 2468 |
| 3316 | 2469 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
| 2470 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
| 2471 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
| 1168 | 2472 x_offset += 8*s->mb_x; |
| 3316 | 2473 y_offset += 8*(s->mb_y >> MB_MBAFF); |
| 2967 | 2474 |
| 1168 | 2475 if(list0){ |
| 1169 | 2476 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 2477 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 2478 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2479 qpix_op, chroma_op); | |
| 2480 | |
| 2481 qpix_op= qpix_avg; | |
| 2482 chroma_op= chroma_avg; | |
| 2483 } | |
| 2484 | |
| 2485 if(list1){ | |
| 1169 | 2486 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 2487 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 2488 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2489 qpix_op, chroma_op); | |
| 2490 } | |
| 2491 } | |
| 2492 | |
| 2415 | 2493 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
| 2494 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2495 int x_offset, int y_offset, | |
| 2496 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2497 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
| 2498 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
| 2499 int list0, int list1){ | |
| 2500 MpegEncContext * const s = &h->s; | |
| 2501 | |
| 3316 | 2502 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
| 2503 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
| 2504 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
| 2415 | 2505 x_offset += 8*s->mb_x; |
| 3316 | 2506 y_offset += 8*(s->mb_y >> MB_MBAFF); |
| 2967 | 2507 |
| 2415 | 2508 if(list0 && list1){ |
| 2509 /* don't optimize for luma-only case, since B-frames usually | |
| 2510 * use implicit weights => chroma too. */ | |
| 2511 uint8_t *tmp_cb = s->obmc_scratchpad; | |
| 3316 | 2512 uint8_t *tmp_cr = s->obmc_scratchpad + 8; |
| 2513 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize; | |
| 2415 | 2514 int refn0 = h->ref_cache[0][ scan8[n] ]; |
| 2515 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
| 2516 | |
| 2517 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
| 2518 dest_y, dest_cb, dest_cr, | |
| 2519 x_offset, y_offset, qpix_put, chroma_put); | |
| 2520 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
| 2521 tmp_y, tmp_cb, tmp_cr, | |
| 2522 x_offset, y_offset, qpix_put, chroma_put); | |
| 2523 | |
| 2524 if(h->use_weight == 2){ | |
| 2525 int weight0 = h->implicit_weight[refn0][refn1]; | |
| 2526 int weight1 = 64 - weight0; | |
| 3316 | 2527 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0); |
| 2528 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
| 2529 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
| 2415 | 2530 }else{ |
| 3316 | 2531 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom, |
| 2967 | 2532 h->luma_weight[0][refn0], h->luma_weight[1][refn1], |
| 3029 | 2533 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]); |
| 3316 | 2534 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2967 | 2535 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], |
| 3029 | 2536 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]); |
| 3316 | 2537 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2967 | 2538 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], |
| 3029 | 2539 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]); |
| 2415 | 2540 } |
| 2541 }else{ | |
| 2542 int list = list1 ? 1 : 0; | |
| 2543 int refn = h->ref_cache[list][ scan8[n] ]; | |
| 2544 Picture *ref= &h->ref_list[list][refn]; | |
| 2545 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
| 2546 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2547 qpix_put, chroma_put); | |
| 2548 | |
| 3316 | 2549 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom, |
| 2415 | 2550 h->luma_weight[list][refn], h->luma_offset[list][refn]); |
| 2551 if(h->use_weight_chroma){ | |
| 3316 | 2552 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2415 | 2553 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); |
| 3316 | 2554 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2415 | 2555 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); |
| 2556 } | |
| 2557 } | |
| 2558 } | |
| 2559 | |
| 2560 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 2561 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2562 int x_offset, int y_offset, | |
| 2563 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2564 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2967 | 2565 h264_weight_func *weight_op, h264_biweight_func *weight_avg, |
| 2415 | 2566 int list0, int list1){ |
| 2567 if((h->use_weight==2 && list0 && list1 | |
| 2568 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
| 2569 || h->use_weight==1) | |
| 2570 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2571 x_offset, y_offset, qpix_put, chroma_put, | |
| 2572 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
| 2573 else | |
| 2574 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2575 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
| 2576 } | |
| 2577 | |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2578 static inline void prefetch_motion(H264Context *h, int list){ |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2579 /* fetch pixels for estimated mv 4 macroblocks ahead |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2580 * optimized for 64byte cache lines */ |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2581 MpegEncContext * const s = &h->s; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2582 const int refn = h->ref_cache[list][scan8[0]]; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2583 if(refn >= 0){ |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2584 const int mx= (h->mv_cache[list][scan8[0]][0]>>2) + 16*s->mb_x + 8; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2585 const int my= (h->mv_cache[list][scan8[0]][1]>>2) + 16*s->mb_y; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2586 uint8_t **src= h->ref_list[list][refn].data; |
| 3316 | 2587 int off= mx + (my + (s->mb_x&3)*4)*h->mb_linesize + 64; |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2588 s->dsp.prefetch(src[0]+off, s->linesize, 4); |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2589 off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2590 s->dsp.prefetch(src[1]+off, src[2]-src[1], 2); |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2591 } |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2592 } |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2593 |
| 1168 | 2594 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2595 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2415 | 2596 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
| 2597 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
| 1168 | 2598 MpegEncContext * const s = &h->s; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2599 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2600 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2967 | 2601 |
| 1168 | 2602 assert(IS_INTER(mb_type)); |
| 2967 | 2603 |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2604 prefetch_motion(h, 0); |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2605 |
| 1168 | 2606 if(IS_16X16(mb_type)){ |
| 2607 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2608 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2415 | 2609 &weight_op[0], &weight_avg[0], |
| 1168 | 2610 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2611 }else if(IS_16X8(mb_type)){ | |
| 2612 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2613 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2614 &weight_op[1], &weight_avg[1], |
| 1168 | 2615 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2616 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 2617 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2618 &weight_op[1], &weight_avg[1], |
| 1168 | 2619 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2620 }else if(IS_8X16(mb_type)){ | |
| 3316 | 2621 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, |
| 1168 | 2622 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
| 2415 | 2623 &weight_op[2], &weight_avg[2], |
| 1168 | 2624 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 3316 | 2625 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, |
| 1168 | 2626 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
| 2415 | 2627 &weight_op[2], &weight_avg[2], |
| 1168 | 2628 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2629 }else{ | |
| 2630 int i; | |
| 2967 | 2631 |
| 1168 | 2632 assert(IS_8X8(mb_type)); |
| 2633 | |
| 2634 for(i=0; i<4; i++){ | |
| 2635 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2636 const int n= 4*i; | |
| 2637 int x_offset= (i&1)<<2; | |
| 2638 int y_offset= (i&2)<<1; | |
| 2639 | |
| 2640 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2641 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2642 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2643 &weight_op[3], &weight_avg[3], |
| 1168 | 2644 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2645 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2646 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2647 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2648 &weight_op[4], &weight_avg[4], |
| 1168 | 2649 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2650 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 2651 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2652 &weight_op[4], &weight_avg[4], |
| 1168 | 2653 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2654 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 3316 | 2655 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, |
| 1168 | 2656 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
| 2415 | 2657 &weight_op[5], &weight_avg[5], |
| 1168 | 2658 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 3316 | 2659 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, |
| 1168 | 2660 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
| 2415 | 2661 &weight_op[5], &weight_avg[5], |
| 1168 | 2662 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2663 }else{ | |
| 2664 int j; | |
| 2665 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2666 for(j=0; j<4; j++){ | |
| 2667 int sub_x_offset= x_offset + 2*(j&1); | |
| 2668 int sub_y_offset= y_offset + (j&2); | |
| 2669 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2670 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2671 &weight_op[6], &weight_avg[6], |
| 1168 | 2672 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2673 } | |
| 2674 } | |
| 2675 } | |
| 2676 } | |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2677 |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2678 prefetch_motion(h, 1); |
| 1168 | 2679 } |
| 2680 | |
|
4783
011fb289e3b0
changes some function declarations from () to (void) as per ansi c.
gpoirier
parents:
4745
diff
changeset
|
2681 static void decode_init_vlc(void){ |
| 1168 | 2682 static int done = 0; |
| 2683 | |
| 2684 if (!done) { | |
| 2685 int i; | |
| 2686 done = 1; | |
| 2687 | |
| 2967 | 2688 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, |
| 1168 | 2689 &chroma_dc_coeff_token_len [0], 1, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2690 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
| 1168 | 2691 |
| 2692 for(i=0; i<4; i++){ | |
| 2967 | 2693 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, |
| 1168 | 2694 &coeff_token_len [i][0], 1, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2695 &coeff_token_bits[i][0], 1, 1, 1); |
| 1168 | 2696 } |
| 2697 | |
| 2698 for(i=0; i<3; i++){ | |
| 2699 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2700 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2701 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2702 } |
| 2703 for(i=0; i<15; i++){ | |
| 2967 | 2704 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, |
| 1168 | 2705 &total_zeros_len [i][0], 1, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2706 &total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2707 } |
| 2708 | |
| 2709 for(i=0; i<6; i++){ | |
| 2967 | 2710 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, |
| 1168 | 2711 &run_len [i][0], 1, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2712 &run_bits[i][0], 1, 1, 1); |
| 1168 | 2713 } |
| 2967 | 2714 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, |
| 1168 | 2715 &run_len [6][0], 1, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2716 &run_bits[6][0], 1, 1, 1); |
| 1168 | 2717 } |
| 2718 } | |
| 2719 | |
| 2720 /** | |
| 2721 * Sets the intra prediction function pointers. | |
| 2722 */ | |
| 2723 static void init_pred_ptrs(H264Context *h){ | |
| 2724 // MpegEncContext * const s = &h->s; | |
| 2725 | |
| 2726 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2727 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2728 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2729 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2730 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2731 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2732 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2733 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2734 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2735 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2736 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2737 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2738 | |
| 2755 | 2739 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
| 2740 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; | |
| 2741 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; | |
| 2742 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; | |
| 2743 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; | |
| 2744 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; | |
| 2745 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; | |
| 2746 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; | |
| 2747 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; | |
| 2748 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; | |
| 2749 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; | |
| 2750 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; | |
| 2751 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2752 h->pred8x8[DC_PRED8x8 ]= ff_pred8x8_dc_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2753 h->pred8x8[VERT_PRED8x8 ]= ff_pred8x8_vertical_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2754 h->pred8x8[HOR_PRED8x8 ]= ff_pred8x8_horizontal_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2755 h->pred8x8[PLANE_PRED8x8 ]= ff_pred8x8_plane_c; |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2756 h->pred8x8[LEFT_DC_PRED8x8]= ff_pred8x8_left_dc_c; |
|
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2757 h->pred8x8[TOP_DC_PRED8x8 ]= ff_pred8x8_top_dc_c; |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2758 h->pred8x8[DC_128_PRED8x8 ]= ff_pred8x8_128_dc_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2759 |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2760 h->pred16x16[DC_PRED8x8 ]= ff_pred16x16_dc_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2761 h->pred16x16[VERT_PRED8x8 ]= ff_pred16x16_vertical_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2762 h->pred16x16[HOR_PRED8x8 ]= ff_pred16x16_horizontal_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2763 h->pred16x16[PLANE_PRED8x8 ]= ff_pred16x16_plane_c; |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2764 h->pred16x16[LEFT_DC_PRED8x8]= ff_pred16x16_left_dc_c; |
|
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2765 h->pred16x16[TOP_DC_PRED8x8 ]= ff_pred16x16_top_dc_c; |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2766 h->pred16x16[DC_128_PRED8x8 ]= ff_pred16x16_128_dc_c; |
| 1168 | 2767 } |
| 2768 | |
| 2769 static void free_tables(H264Context *h){ | |
| 5079 | 2770 int i; |
| 1168 | 2771 av_freep(&h->intra4x4_pred_mode); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2772 av_freep(&h->chroma_pred_mode_table); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2773 av_freep(&h->cbp_table); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2774 av_freep(&h->mvd_table[0]); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2775 av_freep(&h->mvd_table[1]); |
| 2396 | 2776 av_freep(&h->direct_table); |
| 1168 | 2777 av_freep(&h->non_zero_count); |
| 2778 av_freep(&h->slice_table_base); | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2779 av_freep(&h->top_borders[1]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2780 av_freep(&h->top_borders[0]); |
| 1168 | 2781 h->slice_table= NULL; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2782 |
| 1168 | 2783 av_freep(&h->mb2b_xy); |
| 2784 av_freep(&h->mb2b8_xy); | |
| 2415 | 2785 |
| 2786 av_freep(&h->s.obmc_scratchpad); | |
| 5079 | 2787 |
| 2788 for(i = 0; i < MAX_SPS_COUNT; i++) | |
| 2789 av_freep(h->sps_buffers + i); | |
| 2790 | |
| 2791 for(i = 0; i < MAX_PPS_COUNT; i++) | |
| 2792 av_freep(h->pps_buffers + i); | |
| 1168 | 2793 } |
| 2794 | |
| 2919 | 2795 static void init_dequant8_coeff_table(H264Context *h){ |
| 2796 int i,q,x; | |
| 3174 | 2797 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly |
| 2919 | 2798 h->dequant8_coeff[0] = h->dequant8_buffer[0]; |
| 2799 h->dequant8_coeff[1] = h->dequant8_buffer[1]; | |
| 2800 | |
| 2801 for(i=0; i<2; i++ ){ | |
| 2802 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){ | |
| 2803 h->dequant8_coeff[1] = h->dequant8_buffer[0]; | |
| 2804 break; | |
| 2805 } | |
| 2806 | |
| 2807 for(q=0; q<52; q++){ | |
|
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2808 int shift = ff_div6[q]; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2809 int idx = ff_rem6[q]; |
| 2919 | 2810 for(x=0; x<64; x++) |
| 3174 | 2811 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = |
| 2812 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * | |
| 2813 h->pps.scaling_matrix8[i][x]) << shift; | |
| 2919 | 2814 } |
| 2815 } | |
| 2816 } | |
| 2817 | |
| 2818 static void init_dequant4_coeff_table(H264Context *h){ | |
| 2819 int i,j,q,x; | |
| 3005 | 2820 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly |
| 2919 | 2821 for(i=0; i<6; i++ ){ |
| 2822 h->dequant4_coeff[i] = h->dequant4_buffer[i]; | |
| 2823 for(j=0; j<i; j++){ | |
| 2824 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){ | |
| 2825 h->dequant4_coeff[i] = h->dequant4_buffer[j]; | |
| 2826 break; | |
| 2827 } | |
| 2828 } | |
| 2829 if(j<i) | |
| 2830 continue; | |
| 2831 | |
| 2832 for(q=0; q<52; q++){ | |
|
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2833 int shift = ff_div6[q] + 2; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2834 int idx = ff_rem6[q]; |
| 2919 | 2835 for(x=0; x<16; x++) |
| 3005 | 2836 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = |
| 2837 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * | |
| 2919 | 2838 h->pps.scaling_matrix4[i][x]) << shift; |
| 2839 } | |
| 2840 } | |
| 2841 } | |
| 2842 | |
| 2843 static void init_dequant_tables(H264Context *h){ | |
| 2844 int i,x; | |
| 2845 init_dequant4_coeff_table(h); | |
| 2846 if(h->pps.transform_8x8_mode) | |
| 2847 init_dequant8_coeff_table(h); | |
| 2848 if(h->sps.transform_bypass){ | |
| 2849 for(i=0; i<6; i++) | |
| 2850 for(x=0; x<16; x++) | |
| 2851 h->dequant4_coeff[i][0][x] = 1<<6; | |
| 2852 if(h->pps.transform_8x8_mode) | |
| 2853 for(i=0; i<2; i++) | |
| 2854 for(x=0; x<64; x++) | |
| 2855 h->dequant8_coeff[i][0][x] = 1<<6; | |
| 2856 } | |
| 2857 } | |
| 2858 | |
| 2859 | |
| 1168 | 2860 /** |
| 2861 * allocates tables. | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2862 * needs width/height |
| 1168 | 2863 */ |
| 2864 static int alloc_tables(H264Context *h){ | |
| 2865 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2866 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 2919 | 2867 int x,y; |
| 1168 | 2868 |
| 2869 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t)) | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2870 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2871 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 3316 | 2872 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t)) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2873 CHECKED_ALLOCZ(h->top_borders[0] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2874 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 2336 | 2875 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
| 1168 | 2876 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2877 if( h->pps.cabac ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2878 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2879 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t)); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2880 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
| 2396 | 2881 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t)); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2882 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2883 |
| 3316 | 2884 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t)); |
| 2885 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; | |
| 1168 | 2886 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2887 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t)); |
|
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2888 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
| 1168 | 2889 for(y=0; y<s->mb_height; y++){ |
| 2890 for(x=0; x<s->mb_width; x++){ | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2891 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2892 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2893 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2967 | 2894 |
| 1168 | 2895 h->mb2b_xy [mb_xy]= b_xy; |
| 2896 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2897 } | |
| 2898 } | |
| 2415 | 2899 |
| 2417 | 2900 s->obmc_scratchpad = NULL; |
| 2901 | |
| 2920 | 2902 if(!h->dequant4_coeff[0]) |
| 2903 init_dequant_tables(h); | |
| 2904 | |
| 1168 | 2905 return 0; |
| 2906 fail: | |
| 2907 free_tables(h); | |
| 2908 return -1; | |
| 2909 } | |
| 2910 | |
| 2911 static void common_init(H264Context *h){ | |
| 2912 MpegEncContext * const s = &h->s; | |
| 2913 | |
| 2914 s->width = s->avctx->width; | |
| 2915 s->height = s->avctx->height; | |
| 2916 s->codec_id= s->avctx->codec->id; | |
| 2967 | 2917 |
| 1168 | 2918 init_pred_ptrs(h); |
| 2919 | |
| 2919 | 2920 h->dequant_coeff_pps= -1; |
| 1698 | 2921 s->unrestricted_mv=1; |
| 1168 | 2922 s->decode=1; //FIXME |
| 2920 | 2923 |
| 2924 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t)); | |
| 2925 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
| 1168 | 2926 } |
| 2927 | |
| 2928 static int decode_init(AVCodecContext *avctx){ | |
| 2929 H264Context *h= avctx->priv_data; | |
| 2930 MpegEncContext * const s = &h->s; | |
| 2931 | |
| 1892 | 2932 MPV_decode_defaults(s); |
| 2967 | 2933 |
| 1168 | 2934 s->avctx = avctx; |
| 2935 common_init(h); | |
| 2936 | |
| 2937 s->out_format = FMT_H264; | |
| 2938 s->workaround_bugs= avctx->workaround_bugs; | |
| 2939 | |
| 2940 // set defaults | |
| 2941 // s->decode_mb= ff_h263_decode_mb; | |
| 2942 s->low_delay= 1; | |
| 2943 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 2944 | |
|
4164
171e768324cd
Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents:
4118
diff
changeset
|
2945 decode_init_vlc(); |
| 2967 | 2946 |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2947 if(avctx->extradata_size > 0 && avctx->extradata && |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2948 *(char *)avctx->extradata == 1){ |
| 2227 | 2949 h->is_avc = 1; |
| 2950 h->got_avcC = 0; | |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2951 } else { |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2952 h->is_avc = 0; |
| 2227 | 2953 } |
| 2954 | |
| 1168 | 2955 return 0; |
| 2956 } | |
| 2957 | |
| 2935 | 2958 static int frame_start(H264Context *h){ |
| 1168 | 2959 MpegEncContext * const s = &h->s; |
| 2960 int i; | |
| 2961 | |
| 2935 | 2962 if(MPV_frame_start(s, s->avctx) < 0) |
| 2963 return -1; | |
| 1168 | 2964 ff_er_frame_start(s); |
| 2965 | |
| 2966 assert(s->linesize && s->uvlinesize); | |
| 2967 | |
| 2968 for(i=0; i<16; i++){ | |
| 2969 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2970 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2971 } |
| 2972 for(i=0; i<4; i++){ | |
| 2973 h->block_offset[16+i]= | |
| 2974 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2975 h->block_offset[24+16+i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2976 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2977 } |
| 2978 | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2979 /* can't be in alloc_tables because linesize isn't known there. |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2980 * FIXME: redo bipred weight to not require extra buffer? */ |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2981 if(!s->obmc_scratchpad) |
| 3316 | 2982 s->obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize); |
| 2983 | |
| 2984 /* some macroblocks will be accessed before they're available */ | |
| 2985 if(FRAME_MBAFF) | |
| 2986 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t)); | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2987 |
| 1168 | 2988 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
| 2935 | 2989 return 0; |
| 1168 | 2990 } |
| 2991 | |
| 5106 | 2992 static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int simple){ |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2993 MpegEncContext * const s = &h->s; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2994 int i; |
| 2967 | 2995 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2996 src_y -= linesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2997 src_cb -= uvlinesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2998 src_cr -= uvlinesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2999 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3000 // There are two lines saved, the line above the the top macroblock of a pair, |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3001 // and the line above the bottom macroblock |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3002 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3003 for(i=1; i<17; i++){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3004 h->left_border[i]= src_y[15+i* linesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3005 } |
| 2967 | 3006 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3007 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3008 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3009 |
| 5106 | 3010 if(simple || !(s->flags&CODEC_FLAG_GRAY)){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3011 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3012 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3013 for(i=1; i<9; i++){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3014 h->left_border[i+17 ]= src_cb[7+i*uvlinesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3015 h->left_border[i+17+9]= src_cr[7+i*uvlinesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3016 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3017 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3018 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3019 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3020 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3021 |
| 5106 | 3022 static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg, int simple){ |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3023 MpegEncContext * const s = &h->s; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3024 int temp8, i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3025 uint64_t temp64; |
|
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3026 int deblock_left; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3027 int deblock_top; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3028 int mb_xy; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3029 |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3030 if(h->deblocking_filter == 2) { |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3031 mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3032 deblock_left = h->slice_table[mb_xy] == h->slice_table[mb_xy - 1]; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3033 deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy]; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3034 } else { |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3035 deblock_left = (s->mb_x > 0); |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3036 deblock_top = (s->mb_y > 0); |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3037 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3038 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3039 src_y -= linesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3040 src_cb -= uvlinesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3041 src_cr -= uvlinesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3042 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3043 #define XCHG(a,b,t,xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3044 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3045 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3046 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3047 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3048 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3049 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3050 for(i = !deblock_top; i<17; i++){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3051 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3052 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3053 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3054 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3055 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3056 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3057 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
| 2803 | 3058 if(s->mb_x+1 < s->mb_width){ |
| 2755 | 3059 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); |
| 3060 } | |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3061 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3062 |
| 5106 | 3063 if(simple || !(s->flags&CODEC_FLAG_GRAY)){ |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3064 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3065 for(i = !deblock_top; i<9; i++){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3066 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3067 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3068 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3069 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3070 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3071 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3072 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3073 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3074 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3075 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3076 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3077 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3078 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3079 int i; |
| 2967 | 3080 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3081 src_y -= 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3082 src_cb -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3083 src_cr -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3084 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3085 // There are two lines saved, the line above the the top macroblock of a pair, |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3086 // and the line above the bottom macroblock |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3087 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3088 h->left_border[1]= h->top_borders[1][s->mb_x][15]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3089 for(i=2; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3090 h->left_border[i]= src_y[15+i* linesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3091 } |
| 2967 | 3092 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3093 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3094 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3095 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3096 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3097 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3098 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3099 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3100 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3101 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3102 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3103 for(i=2; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3104 h->left_border[i+34 ]= src_cb[7+i*uvlinesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3105 h->left_border[i+34+18]= src_cr[7+i*uvlinesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3106 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3107 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3108 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3109 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3110 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3111 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3112 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3113 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3114 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3115 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3116 int temp8, i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3117 uint64_t temp64; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3118 int deblock_left = (s->mb_x > 0); |
| 3316 | 3119 int deblock_top = (s->mb_y > 1); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3120 |
| 4600 | 3121 tprintf(s->avctx, "xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3122 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3123 src_y -= 2 * linesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3124 src_cb -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3125 src_cr -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3126 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3127 #define XCHG(a,b,t,xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3128 t= a;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3129 if(xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3130 a= b;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3131 b= t; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3132 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3133 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3134 for(i = (!deblock_top)<<1; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3135 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3136 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3137 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3138 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3139 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3140 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3141 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3142 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3143 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1); |
| 3316 | 3144 if(s->mb_x+1 < s->mb_width){ |
| 3145 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
| 3146 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1); | |
| 3147 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3148 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3149 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3150 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3151 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3152 for(i = (!deblock_top) << 1; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3153 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3154 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3155 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3156 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3157 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3158 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3159 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3160 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3161 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1); |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3162 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3163 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3164 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3165 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
3166 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ |
| 1168 | 3167 MpegEncContext * const s = &h->s; |
| 3168 const int mb_x= s->mb_x; | |
| 3169 const int mb_y= s->mb_y; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
3170 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 3171 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 3172 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 3173 int linesize, uvlinesize /*dct_offset*/; | |
| 3174 int i; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3175 int *block_offset = &h->block_offset[0]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3176 const unsigned int bottom = mb_y & 1; |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3177 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass), is_h264 = (simple || s->codec_id == CODEC_ID_H264); |
| 2763 | 3178 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3179 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride); |
| 1168 | 3180 |
| 3181 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 3182 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3183 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3184 | |
| 4000 | 3185 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4); |
| 3186 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2); | |
| 3187 | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3188 if (!simple && MB_FIELD) { |
| 3316 | 3189 linesize = h->mb_linesize = s->linesize * 2; |
| 3190 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3191 block_offset = &h->block_offset[24]; |
| 1168 | 3192 if(mb_y&1){ //FIXME move out of this func? |
| 3193 dest_y -= s->linesize*15; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3194 dest_cb-= s->uvlinesize*7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3195 dest_cr-= s->uvlinesize*7; |
| 1168 | 3196 } |
| 3316 | 3197 if(FRAME_MBAFF) { |
| 3198 int list; | |
| 4533 | 3199 for(list=0; list<h->list_count; list++){ |
| 3316 | 3200 if(!USES_LIST(mb_type, list)) |
| 3201 continue; | |
| 3202 if(IS_16X16(mb_type)){ | |
| 3203 int8_t *ref = &h->ref_cache[list][scan8[0]]; | |
| 3204 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1); | |
| 3205 }else{ | |
| 3206 for(i=0; i<16; i+=4){ | |
| 3207 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ? | |
| 3208 int ref = h->ref_cache[list][scan8[i]]; | |
| 3209 if(ref >= 0) | |
| 3210 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1); | |
| 3211 } | |
| 3212 } | |
| 3213 } | |
| 3214 } | |
| 1168 | 3215 } else { |
| 3316 | 3216 linesize = h->mb_linesize = s->linesize; |
| 3217 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
| 1168 | 3218 // dct_offset = s->linesize * 16; |
| 3219 } | |
| 2967 | 3220 |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3221 if(transform_bypass){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3222 idct_dc_add = |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3223 idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3224 }else if(IS_8x8DCT(mb_type)){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3225 idct_dc_add = s->dsp.h264_idct8_dc_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3226 idct_add = s->dsp.h264_idct8_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3227 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3228 idct_dc_add = s->dsp.h264_idct_dc_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3229 idct_add = s->dsp.h264_idct_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3230 } |
| 1168 | 3231 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3232 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type) |
| 3316 | 3233 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){ |
| 3234 int mbt_y = mb_y&~1; | |
| 3235 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16; | |
| 3236 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3237 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3238 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1); | |
| 3239 } | |
| 3240 | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3241 if (!simple && IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3242 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3243 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3244 // The pixels are stored in h->mb array in the same order as levels, |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3245 // copy them in output in the correct order. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3246 for(i=0; i<16; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3247 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3248 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3249 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3250 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3251 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3252 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3253 for(i=16; i<16+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3254 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3255 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3256 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3257 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3258 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3259 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3260 for(i=20; i<20+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3261 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3262 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3263 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3264 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3265 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3266 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3267 } else { |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3268 if(IS_INTRA(mb_type)){ |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3269 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
| 5106 | 3270 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1, simple); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3271 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3272 if(simple || !(s->flags&CODEC_FLAG_GRAY)){ |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3273 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3274 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3275 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3276 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3277 if(IS_INTRA4x4(mb_type)){ |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3278 if(simple || !s->encoding){ |
| 2755 | 3279 if(IS_8x8DCT(mb_type)){ |
| 3280 for(i=0; i<16; i+=4){ | |
| 3281 uint8_t * const ptr= dest_y + block_offset[i]; | |
| 3282 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3283 const int nnz = h->non_zero_count_cache[ scan8[i] ]; |
| 2755 | 3284 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, |
| 4546 | 3285 (h->topright_samples_available<<i)&0x4000, linesize); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3286 if(nnz){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3287 if(nnz == 1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3288 idct_dc_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3289 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3290 idct_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3291 } |
| 2755 | 3292 } |
| 3293 }else | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3294 for(i=0; i<16; i++){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3295 uint8_t * const ptr= dest_y + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3296 uint8_t *topright; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3297 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3298 int nnz, tr; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3299 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3300 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3301 const int topright_avail= (h->topright_samples_available<<i)&0x8000; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3302 assert(mb_y || linesize <= block_offset[i]); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3303 if(!topright_avail){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3304 tr= ptr[3 - linesize]*0x01010101; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3305 topright= (uint8_t*) &tr; |
| 2967 | 3306 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3307 topright= ptr + 4 - linesize; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3308 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3309 topright= NULL; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3310 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3311 h->pred4x4[ dir ](ptr, topright, linesize); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3312 nnz = h->non_zero_count_cache[ scan8[i] ]; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3313 if(nnz){ |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3314 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3315 if(nnz == 1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3316 idct_dc_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3317 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3318 idct_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3319 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3320 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3321 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3322 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3323 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3324 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3325 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3326 if(is_h264){ |
| 2763 | 3327 if(!transform_bypass) |
| 2919 | 3328 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[IS_INTRA(mb_type) ? 0:3][s->qscale][0]); |
| 2763 | 3329 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3330 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3331 } |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3332 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
| 5106 | 3333 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple); |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3334 }else if(is_h264){ |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3335 hl_motion(h, dest_y, dest_cb, dest_cr, |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
3336 s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab, |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
3337 s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab, |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3338 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3339 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3340 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3341 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3342 if(!IS_INTRA4x4(mb_type)){ |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3343 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3344 if(IS_INTRA16x16(mb_type)){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3345 for(i=0; i<16; i++){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3346 if(h->non_zero_count_cache[ scan8[i] ]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3347 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3348 else if(h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3349 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3350 } |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3351 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3352 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3353 for(i=0; i<16; i+=di){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3354 int nnz = h->non_zero_count_cache[ scan8[i] ]; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3355 if(nnz){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3356 if(nnz==1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3357 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3358 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3359 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3360 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3361 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3362 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3363 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3364 for(i=0; i<16; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3365 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3366 uint8_t * const ptr= dest_y + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3367 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1234 | 3368 } |
| 1168 | 3369 } |
| 3370 } | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3371 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3372 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3373 if(simple || !(s->flags&CODEC_FLAG_GRAY)){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3374 uint8_t *dest[2] = {dest_cb, dest_cr}; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3375 if(transform_bypass){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3376 idct_add = idct_dc_add = s->dsp.add_pixels4; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3377 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3378 idct_add = s->dsp.h264_idct_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3379 idct_dc_add = s->dsp.h264_idct_dc_add; |
| 2919 | 3380 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp][0]); |
| 3381 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp][0]); | |
| 2763 | 3382 } |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3383 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3384 for(i=16; i<16+8; i++){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3385 if(h->non_zero_count_cache[ scan8[i] ]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3386 idct_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3387 else if(h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3388 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3389 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3390 }else{ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3391 for(i=16; i<16+8; i++){ |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3392 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3393 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3394 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3395 } |
| 1250 | 3396 } |
| 1168 | 3397 } |
| 3398 } | |
| 3399 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3400 if(h->deblocking_filter) { |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3401 if (!simple && FRAME_MBAFF) { |
| 3316 | 3402 //FIXME try deblocking one mb at a time? |
| 3403 // the reduction in load/storing mvs and such might outweigh the extra backup/xchg_border | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3404 const int mb_y = s->mb_y - 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3405 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3406 const int mb_xy= mb_x + mb_y*s->mb_stride; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3407 const int mb_type_top = s->current_picture.mb_type[mb_xy]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3408 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3409 if (!bottom) return; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3410 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3411 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3412 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3413 |
| 3316 | 3414 if(IS_INTRA(mb_type_top | mb_type_bottom)) |
| 3415 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0); | |
| 3416 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3417 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize); |
| 3316 | 3418 // deblock a pair |
| 2967 | 3419 // top |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3420 s->mb_y--; |
| 4600 | 3421 tprintf(h->s.avctx, "call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3422 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb |
| 3316 | 3423 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy]); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3424 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3425 // bottom |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3426 s->mb_y++; |
| 4600 | 3427 tprintf(h->s.avctx, "call mbaff filter_mb\n"); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3428 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb |
| 3316 | 3429 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy+s->mb_stride]); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3430 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3431 } else { |
| 4600 | 3432 tprintf(h->s.avctx, "call filter_mb\n"); |
| 5106 | 3433 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3434 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
3435 filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3436 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3437 } |
| 1168 | 3438 } |
| 3439 | |
| 3440 /** | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3441 * Process a macroblock; this case avoids checks for expensive uncommon cases. |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3442 */ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3443 static void hl_decode_mb_simple(H264Context *h){ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3444 hl_decode_mb_internal(h, 1); |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3445 } |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3446 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3447 /** |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3448 * Process a macroblock; this handles edge cases, such as interlacing. |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3449 */ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3450 static void av_noinline hl_decode_mb_complex(H264Context *h){ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3451 hl_decode_mb_internal(h, 0); |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3452 } |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3453 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3454 static void hl_decode_mb(H264Context *h){ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3455 MpegEncContext * const s = &h->s; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3456 const int mb_x= s->mb_x; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3457 const int mb_y= s->mb_y; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3458 const int mb_xy= mb_x + mb_y*s->mb_stride; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3459 const int mb_type= s->current_picture.mb_type[mb_xy]; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3460 int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (s->flags&CODEC_FLAG_GRAY) || s->encoding; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3461 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3462 if(!s->decode) |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3463 return; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3464 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3465 if (is_complex) |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3466 hl_decode_mb_complex(h); |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3467 else hl_decode_mb_simple(h); |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3468 } |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3469 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3470 /** |
| 1168 | 3471 * fills the default_ref_list. |
| 3472 */ | |
| 3473 static int fill_default_ref_list(H264Context *h){ | |
| 3474 MpegEncContext * const s = &h->s; | |
| 3475 int i; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3476 int smallest_poc_greater_than_current = -1; |
| 2582 | 3477 Picture sorted_short_ref[32]; |
| 2967 | 3478 |
| 1168 | 3479 if(h->slice_type==B_TYPE){ |
| 3480 int out_i; | |
| 2713 | 3481 int limit= INT_MIN; |
| 1168 | 3482 |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3483 /* sort frame according to poc in B slice */ |
| 1168 | 3484 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
| 2713 | 3485 int best_i=INT_MIN; |
|
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
3486 int best_poc=INT_MAX; |
| 1168 | 3487 |
| 3488 for(i=0; i<h->short_ref_count; i++){ | |
| 3489 const int poc= h->short_ref[i]->poc; | |
| 3490 if(poc > limit && poc < best_poc){ | |
| 3491 best_poc= poc; | |
| 3492 best_i= i; | |
| 3493 } | |
| 3494 } | |
| 2967 | 3495 |
| 2713 | 3496 assert(best_i != INT_MIN); |
| 2967 | 3497 |
| 1168 | 3498 limit= best_poc; |
| 3499 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
| 4600 | 3500 tprintf(h->s.avctx, "sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num); |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3501 if (-1 == smallest_poc_greater_than_current) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3502 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3503 smallest_poc_greater_than_current = out_i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3504 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3505 } |
| 1168 | 3506 } |
| 3507 } | |
| 3508 | |
| 3509 if(s->picture_structure == PICT_FRAME){ | |
| 3510 if(h->slice_type==B_TYPE){ | |
| 3511 int list; | |
| 4600 | 3512 tprintf(h->s.avctx, "current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current); |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3513 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3514 // find the largest poc |
| 1168 | 3515 for(list=0; list<2; list++){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3516 int index = 0; |
| 2447 | 3517 int j= -99; |
| 3518 int step= list ? -1 : 1; | |
| 3519 | |
| 3520 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
| 3521 while(j<0 || j>= h->short_ref_count){ | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3522 if(j != -99 && step == (list ? -1 : 1)) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3523 return -1; |
| 2447 | 3524 step = -step; |
| 3525 j= smallest_poc_greater_than_current + (step>>1); | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3526 } |
| 2447 | 3527 if(sorted_short_ref[j].reference != 3) continue; |
| 3528 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
| 3529 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
| 1168 | 3530 } |
| 3531 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3532 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3533 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3534 if(h->long_ref[i]->reference != 3) continue; |
| 3535 | |
| 3536 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 3537 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 3538 } | |
| 2967 | 3539 |
| 2447 | 3540 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3541 // swap the two first elements of L1 when |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3542 // L0 and L1 are identical |
| 1168 | 3543 Picture temp= h->default_ref_list[1][0]; |
| 3544 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 2673 | 3545 h->default_ref_list[1][1] = temp; |
| 1168 | 3546 } |
| 3547 | |
| 3548 if(index < h->ref_count[ list ]) | |
| 3549 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 3550 } | |
| 3551 }else{ | |
| 3552 int index=0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3553 for(i=0; i<h->short_ref_count; i++){ |
| 1168 | 3554 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
| 3555 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 3556 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 3557 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3558 for(i = 0; i < 16; i++){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3559 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3560 if(h->long_ref[i]->reference != 3) continue; |
| 3561 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 3562 h->default_ref_list[0][index++].pic_id= i;; | |
| 3563 } | |
| 3564 if(index < h->ref_count[0]) | |
| 3565 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 3566 } | |
| 3567 }else{ //FIELD | |
| 3568 if(h->slice_type==B_TYPE){ | |
| 3569 }else{ | |
| 3570 //FIXME second field balh | |
| 3571 } | |
| 3572 } | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3573 #ifdef TRACE |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3574 for (i=0; i<h->ref_count[0]; i++) { |
| 4600 | 3575 tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]); |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3576 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3577 if(h->slice_type==B_TYPE){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3578 for (i=0; i<h->ref_count[1]; i++) { |
| 4600 | 3579 tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]); |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3580 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3581 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3582 #endif |
| 1168 | 3583 return 0; |
| 3584 } | |
| 3585 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3586 static void print_short_term(H264Context *h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3587 static void print_long_term(H264Context *h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3588 |
| 1168 | 3589 static int decode_ref_pic_list_reordering(H264Context *h){ |
| 3590 MpegEncContext * const s = &h->s; | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3591 int list, index; |
| 2967 | 3592 |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3593 print_short_term(h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3594 print_long_term(h); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3595 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func |
| 2967 | 3596 |
| 4533 | 3597 for(list=0; list<h->list_count; list++){ |
| 1168 | 3598 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); |
| 3599 | |
| 3600 if(get_bits1(&s->gb)){ | |
| 3601 int pred= h->curr_pic_num; | |
| 3602 | |
| 3603 for(index=0; ; index++){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3604 unsigned int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3605 unsigned int pic_id; |
| 1168 | 3606 int i; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3607 Picture *ref = NULL; |
| 2967 | 3608 |
| 3609 if(reordering_of_pic_nums_idc==3) | |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3610 break; |
| 2967 | 3611 |
| 1168 | 3612 if(index >= h->ref_count[list]){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3613 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 3614 return -1; |
| 3615 } | |
| 2967 | 3616 |
| 1168 | 3617 if(reordering_of_pic_nums_idc<3){ |
| 3618 if(reordering_of_pic_nums_idc<2){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3619 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; |
| 1168 | 3620 |
| 3621 if(abs_diff_pic_num >= h->max_pic_num){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3622 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 3623 return -1; |
| 3624 } | |
| 3625 | |
| 3626 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 3627 else pred+= abs_diff_pic_num; | |
| 3628 pred &= h->max_pic_num - 1; | |
| 2967 | 3629 |
| 2683 | 3630 for(i= h->short_ref_count-1; i>=0; i--){ |
| 3631 ref = h->short_ref[i]; | |
| 3632 assert(ref->reference == 3); | |
| 3633 assert(!ref->long_ref); | |
| 3634 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer | |
| 1168 | 3635 break; |
| 3636 } | |
| 2683 | 3637 if(i>=0) |
| 3638 ref->pic_id= ref->frame_num; | |
| 1168 | 3639 }else{ |
| 3640 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3641 if(pic_id>31){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3642 av_log(h->s.avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3643 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3644 } |
| 2683 | 3645 ref = h->long_ref[pic_id]; |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3646 if(ref){ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3647 ref->pic_id= pic_id; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3648 assert(ref->reference == 3); |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3649 assert(ref->long_ref); |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3650 i=0; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3651 }else{ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3652 i=-1; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3653 } |
| 1168 | 3654 } |
| 3655 | |
|
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3656 if (i < 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3657 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 3658 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
| 2683 | 3659 } else { |
| 3660 for(i=index; i+1<h->ref_count[list]; i++){ | |
| 3661 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
| 3662 break; | |
|
2650
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3663 } |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3664 for(; i > index; i--){ |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3665 h->ref_list[list][i]= h->ref_list[list][i-1]; |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3666 } |
| 2683 | 3667 h->ref_list[list][index]= *ref; |
| 1168 | 3668 } |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3669 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3670 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 3671 return -1; |
| 3672 } | |
| 3673 } | |
| 3674 } | |
| 4533 | 3675 } |
| 3676 for(list=0; list<h->list_count; list++){ | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3677 for(index= 0; index < h->ref_count[list]; index++){ |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3678 if(!h->ref_list[list][index].data[0]) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3679 h->ref_list[list][index]= s->current_picture; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3680 } |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3681 } |
| 2967 | 3682 |
| 2396 | 3683 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) |
| 3684 direct_dist_scale_factor(h); | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3685 direct_ref_list_init(h); |
| 2967 | 3686 return 0; |
| 1168 | 3687 } |
| 3688 | |
|
3379
69901769c811
fill_mbaff_ref_list is missing a return statement, its return value
mru
parents:
3341
diff
changeset
|
3689 static void fill_mbaff_ref_list(H264Context *h){ |
| 3316 | 3690 int list, i, j; |
| 4533 | 3691 for(list=0; list<2; list++){ //FIXME try list_count |
| 3316 | 3692 for(i=0; i<h->ref_count[list]; i++){ |
| 3693 Picture *frame = &h->ref_list[list][i]; | |
| 3694 Picture *field = &h->ref_list[list][16+2*i]; | |
| 3695 field[0] = *frame; | |
| 3696 for(j=0; j<3; j++) | |
| 3697 field[0].linesize[j] <<= 1; | |
| 3698 field[1] = field[0]; | |
| 3699 for(j=0; j<3; j++) | |
| 3700 field[1].data[j] += frame->linesize[j]; | |
| 3701 | |
| 3702 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i]; | |
| 3703 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i]; | |
| 3704 for(j=0; j<2; j++){ | |
| 3705 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j]; | |
| 3706 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j]; | |
| 3707 } | |
| 3708 } | |
| 3709 } | |
| 3710 for(j=0; j<h->ref_count[1]; j++){ | |
| 3711 for(i=0; i<h->ref_count[0]; i++) | |
| 3712 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i]; | |
| 3713 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
| 3714 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
| 3715 } | |
| 3716 } | |
| 3717 | |
| 1168 | 3718 static int pred_weight_table(H264Context *h){ |
| 3719 MpegEncContext * const s = &h->s; | |
| 3720 int list, i; | |
| 2415 | 3721 int luma_def, chroma_def; |
| 2967 | 3722 |
| 2415 | 3723 h->use_weight= 0; |
| 3724 h->use_weight_chroma= 0; | |
| 1168 | 3725 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
| 3726 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2415 | 3727 luma_def = 1<<h->luma_log2_weight_denom; |
| 3728 chroma_def = 1<<h->chroma_log2_weight_denom; | |
| 1168 | 3729 |
| 3730 for(list=0; list<2; list++){ | |
| 3731 for(i=0; i<h->ref_count[list]; i++){ | |
| 3732 int luma_weight_flag, chroma_weight_flag; | |
| 2967 | 3733 |
| 1168 | 3734 luma_weight_flag= get_bits1(&s->gb); |
| 3735 if(luma_weight_flag){ | |
| 3736 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 3737 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2415 | 3738 if( h->luma_weight[list][i] != luma_def |
| 3739 || h->luma_offset[list][i] != 0) | |
| 3740 h->use_weight= 1; | |
| 3741 }else{ | |
| 3742 h->luma_weight[list][i]= luma_def; | |
| 3743 h->luma_offset[list][i]= 0; | |
| 1168 | 3744 } |
| 3745 | |
| 3746 chroma_weight_flag= get_bits1(&s->gb); | |
| 3747 if(chroma_weight_flag){ | |
| 3748 int j; | |
| 3749 for(j=0; j<2; j++){ | |
| 3750 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 3751 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2415 | 3752 if( h->chroma_weight[list][i][j] != chroma_def |
| 3753 || h->chroma_offset[list][i][j] != 0) | |
| 3754 h->use_weight_chroma= 1; | |
| 3755 } | |
| 3756 }else{ | |
| 3757 int j; | |
| 3758 for(j=0; j<2; j++){ | |
| 3759 h->chroma_weight[list][i][j]= chroma_def; | |
| 3760 h->chroma_offset[list][i][j]= 0; | |
| 1168 | 3761 } |
| 3762 } | |
| 3763 } | |
| 3764 if(h->slice_type != B_TYPE) break; | |
| 3765 } | |
| 2415 | 3766 h->use_weight= h->use_weight || h->use_weight_chroma; |
| 1168 | 3767 return 0; |
| 3768 } | |
| 3769 | |
| 2415 | 3770 static void implicit_weight_table(H264Context *h){ |
| 3771 MpegEncContext * const s = &h->s; | |
| 3772 int ref0, ref1; | |
| 3773 int cur_poc = s->current_picture_ptr->poc; | |
| 3774 | |
| 3775 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
| 3776 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
| 3777 h->use_weight= 0; | |
| 3778 h->use_weight_chroma= 0; | |
| 3779 return; | |
| 3780 } | |
| 3781 | |
| 3782 h->use_weight= 2; | |
| 3783 h->use_weight_chroma= 2; | |
| 3784 h->luma_log2_weight_denom= 5; | |
| 3785 h->chroma_log2_weight_denom= 5; | |
| 3786 | |
| 3787 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
| 3788 int poc0 = h->ref_list[0][ref0].poc; | |
| 3789 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
| 2519 | 3790 int poc1 = h->ref_list[1][ref1].poc; |
| 4594 | 3791 int td = av_clip(poc1 - poc0, -128, 127); |
| 2415 | 3792 if(td){ |
| 4594 | 3793 int tb = av_clip(cur_poc - poc0, -128, 127); |
| 4001 | 3794 int tx = (16384 + (FFABS(td) >> 1)) / td; |
| 4594 | 3795 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; |
| 2415 | 3796 if(dist_scale_factor < -64 || dist_scale_factor > 128) |
| 3797 h->implicit_weight[ref0][ref1] = 32; | |
| 3798 else | |
| 3799 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
| 3800 }else | |
| 3801 h->implicit_weight[ref0][ref1] = 32; | |
| 3802 } | |
| 3803 } | |
| 3804 } | |
| 3805 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3806 static inline void unreference_pic(H264Context *h, Picture *pic){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3807 int i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3808 pic->reference=0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3809 if(pic == h->delayed_output_pic) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3810 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3811 else{ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3812 for(i = 0; h->delayed_pic[i]; i++) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3813 if(pic == h->delayed_pic[i]){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3814 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3815 break; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3816 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3817 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3818 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3819 |
| 1168 | 3820 /** |
| 2392 | 3821 * instantaneous decoder refresh. |
| 1168 | 3822 */ |
| 3823 static void idr(H264Context *h){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3824 int i; |
| 1168 | 3825 |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3826 for(i=0; i<16; i++){ |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3827 if (h->long_ref[i] != NULL) { |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3828 unreference_pic(h, h->long_ref[i]); |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3829 h->long_ref[i]= NULL; |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3830 } |
| 1168 | 3831 } |
| 3832 h->long_ref_count=0; | |
| 3833 | |
| 3834 for(i=0; i<h->short_ref_count; i++){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3835 unreference_pic(h, h->short_ref[i]); |
| 1168 | 3836 h->short_ref[i]= NULL; |
| 3837 } | |
| 3838 h->short_ref_count=0; | |
| 3839 } | |
| 3840 | |
| 2640 | 3841 /* forget old pics after a seek */ |
| 3842 static void flush_dpb(AVCodecContext *avctx){ | |
| 3843 H264Context *h= avctx->priv_data; | |
| 3844 int i; | |
| 3144 | 3845 for(i=0; i<16; i++) { |
| 3846 if(h->delayed_pic[i]) | |
| 3847 h->delayed_pic[i]->reference= 0; | |
| 2640 | 3848 h->delayed_pic[i]= NULL; |
| 3144 | 3849 } |
| 3850 if(h->delayed_output_pic) | |
| 3851 h->delayed_output_pic->reference= 0; | |
| 2640 | 3852 h->delayed_output_pic= NULL; |
| 3853 idr(h); | |
|
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3854 if(h->s.current_picture_ptr) |
|
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3855 h->s.current_picture_ptr->reference= 0; |
| 2640 | 3856 } |
| 3857 | |
| 1168 | 3858 /** |
| 3859 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3860 * @return the removed picture or NULL if an error occurs |
| 1168 | 3861 */ |
| 3862 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 3863 MpegEncContext * const s = &h->s; |
| 1168 | 3864 int i; |
| 2967 | 3865 |
| 1169 | 3866 if(s->avctx->debug&FF_DEBUG_MMCO) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3867 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 2967 | 3868 |
| 1168 | 3869 for(i=0; i<h->short_ref_count; i++){ |
| 3870 Picture *pic= h->short_ref[i]; | |
| 1169 | 3871 if(s->avctx->debug&FF_DEBUG_MMCO) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3872 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 3873 if(pic->frame_num == frame_num){ |
| 3874 h->short_ref[i]= NULL; | |
| 3875 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 3876 h->short_ref_count--; | |
| 3877 return pic; | |
| 3878 } | |
| 3879 } | |
| 3880 return NULL; | |
| 3881 } | |
| 3882 | |
| 3883 /** | |
| 3884 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3885 * @return the removed picture or NULL if an error occurs |
| 1168 | 3886 */ |
| 3887 static Picture * remove_long(H264Context *h, int i){ | |
| 3888 Picture *pic; | |
| 3889 | |
| 3890 pic= h->long_ref[i]; | |
| 3891 h->long_ref[i]= NULL; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3892 if(pic) h->long_ref_count--; |
| 1168 | 3893 |
| 3894 return pic; | |
| 3895 } | |
| 3896 | |
| 3897 /** | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3898 * print short term list |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3899 */ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3900 static void print_short_term(H264Context *h) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3901 uint32_t i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3902 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3903 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n"); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3904 for(i=0; i<h->short_ref_count; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3905 Picture *pic= h->short_ref[i]; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3906 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3907 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3908 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3909 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3910 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3911 /** |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3912 * print long term list |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3913 */ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3914 static void print_long_term(H264Context *h) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3915 uint32_t i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3916 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3917 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n"); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3918 for(i = 0; i < 16; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3919 Picture *pic= h->long_ref[i]; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3920 if (pic) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3921 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3922 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3923 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3924 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3925 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3926 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3927 /** |
| 1168 | 3928 * Executes the reference picture marking (memory management control operations). |
| 3929 */ | |
| 3930 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 3931 MpegEncContext * const s = &h->s; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3932 int i, j; |
| 1168 | 3933 int current_is_long=0; |
| 3934 Picture *pic; | |
| 2967 | 3935 |
| 1168 | 3936 if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3937 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 2967 | 3938 |
| 1168 | 3939 for(i=0; i<mmco_count; i++){ |
| 3940 if(s->avctx->debug&FF_DEBUG_MMCO) | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3941 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_frame_num, h->mmco[i].long_index); |
| 1168 | 3942 |
| 3943 switch(mmco[i].opcode){ | |
| 3944 case MMCO_SHORT2UNUSED: | |
| 3945 pic= remove_short(h, mmco[i].short_frame_num); | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3946 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3947 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3948 else if(s->avctx->debug&FF_DEBUG_MMCO) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3949 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n"); |
| 1168 | 3950 break; |
| 3951 case MMCO_SHORT2LONG: | |
| 3952 pic= remove_long(h, mmco[i].long_index); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3953 if(pic) unreference_pic(h, pic); |
| 2967 | 3954 |
| 1168 | 3955 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3956 if (h->long_ref[ mmco[i].long_index ]){ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3957 h->long_ref[ mmco[i].long_index ]->long_ref=1; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3958 h->long_ref_count++; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3959 } |
| 1168 | 3960 break; |
| 3961 case MMCO_LONG2UNUSED: | |
| 3962 pic= remove_long(h, mmco[i].long_index); | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3963 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3964 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3965 else if(s->avctx->debug&FF_DEBUG_MMCO) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3966 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n"); |
| 1168 | 3967 break; |
| 3968 case MMCO_LONG: | |
| 3969 pic= remove_long(h, mmco[i].long_index); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3970 if(pic) unreference_pic(h, pic); |
| 2967 | 3971 |
| 1168 | 3972 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; |
| 3973 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 3974 h->long_ref_count++; | |
| 2967 | 3975 |
| 1168 | 3976 current_is_long=1; |
| 3977 break; | |
| 3978 case MMCO_SET_MAX_LONG: | |
| 3979 assert(mmco[i].long_index <= 16); | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3980 // just remove the long term which index is greater than new max |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3981 for(j = mmco[i].long_index; j<16; j++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3982 pic = remove_long(h, j); |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3983 if (pic) unreference_pic(h, pic); |
| 1168 | 3984 } |
| 3985 break; | |
| 3986 case MMCO_RESET: | |
| 3987 while(h->short_ref_count){ | |
| 3988 pic= remove_short(h, h->short_ref[0]->frame_num); | |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3989 if(pic) unreference_pic(h, pic); |
| 1168 | 3990 } |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3991 for(j = 0; j < 16; j++) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3992 pic= remove_long(h, j); |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3993 if(pic) unreference_pic(h, pic); |
| 1168 | 3994 } |
| 3995 break; | |
| 3996 default: assert(0); | |
| 3997 } | |
| 3998 } | |
| 2967 | 3999 |
| 1168 | 4000 if(!current_is_long){ |
| 4001 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 4002 if(pic){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4003 unreference_pic(h, pic); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4004 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 4005 } |
| 2967 | 4006 |
| 1168 | 4007 if(h->short_ref_count) |
| 1169 | 4008 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 4009 | |
| 4010 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 4011 h->short_ref[0]->long_ref=0; |
| 4012 h->short_ref_count++; | |
| 4013 } | |
| 2967 | 4014 |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
4015 print_short_term(h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
4016 print_long_term(h); |
| 2967 | 4017 return 0; |
| 1168 | 4018 } |
| 4019 | |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4020 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){ |
| 1168 | 4021 MpegEncContext * const s = &h->s; |
| 4022 int i; | |
| 2967 | 4023 |
| 1168 | 4024 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4025 s->broken_link= get_bits1(gb) -1; |
|
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4026 h->mmco[0].long_index= get_bits1(gb) - 1; // current_long_term_idx |
| 1168 | 4027 if(h->mmco[0].long_index == -1) |
| 4028 h->mmco_index= 0; | |
| 4029 else{ | |
| 4030 h->mmco[0].opcode= MMCO_LONG; | |
| 4031 h->mmco_index= 1; | |
| 2967 | 4032 } |
| 1168 | 4033 }else{ |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4034 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag |
| 2967 | 4035 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4036 MMCOOpcode opcode= get_ue_golomb(gb); |
| 1168 | 4037 |
| 4038 h->mmco[i].opcode= opcode; | |
| 4039 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4040 h->mmco[i].short_frame_num= (h->frame_num - get_ue_golomb(gb) - 1) & ((1<<h->sps.log2_max_frame_num)-1); //FIXME fields |
| 1168 | 4041 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ |
|
2846
40765c51a7a9
Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents:
2844
diff
changeset
|
4042 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); |
| 1168 | 4043 return -1; |
| 4044 }*/ | |
| 4045 } | |
| 4046 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4047 unsigned int long_index= get_ue_golomb(gb); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4048 if(/*h->mmco[i].long_index >= h->long_ref_count || h->long_ref[ h->mmco[i].long_index ] == NULL*/ long_index >= 16){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4049 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 4050 return -1; |
| 4051 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4052 h->mmco[i].long_index= long_index; |
| 1168 | 4053 } |
| 2967 | 4054 |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4055 if(opcode > (unsigned)MMCO_LONG){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4056 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 4057 return -1; |
| 4058 } | |
|
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
4059 if(opcode == MMCO_END) |
|
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
4060 break; |
| 1168 | 4061 } |
| 4062 h->mmco_index= i; | |
| 4063 }else{ | |
| 4064 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 4065 | |
| 4066 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 4067 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 4068 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 4069 h->mmco_index= 1; | |
| 4070 }else | |
| 4071 h->mmco_index= 0; | |
| 4072 } | |
| 4073 } | |
| 2967 | 4074 |
| 4075 return 0; | |
| 1168 | 4076 } |
| 4077 | |
| 4078 static int init_poc(H264Context *h){ | |
| 4079 MpegEncContext * const s = &h->s; | |
| 4080 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 4081 int field_poc[2]; | |
| 4082 | |
| 4083 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4084 h->frame_num_offset= 0; | |
| 4085 }else{ | |
| 4086 if(h->frame_num < h->prev_frame_num) | |
| 4087 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 4088 else | |
| 4089 h->frame_num_offset= h->prev_frame_num_offset; | |
| 4090 } | |
| 4091 | |
| 4092 if(h->sps.poc_type==0){ | |
| 4093 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 4094 | |
|
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4095 if(h->nal_unit_type == NAL_IDR_SLICE){ |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4096 h->prev_poc_msb= |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4097 h->prev_poc_lsb= 0; |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4098 } |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4099 |
| 1168 | 4100 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) |
| 4101 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 4102 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 4103 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 4104 else | |
| 4105 h->poc_msb = h->prev_poc_msb; | |
| 4106 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 2967 | 4107 field_poc[0] = |
| 1168 | 4108 field_poc[1] = h->poc_msb + h->poc_lsb; |
| 2967 | 4109 if(s->picture_structure == PICT_FRAME) |
| 1168 | 4110 field_poc[1] += h->delta_poc_bottom; |
| 4111 }else if(h->sps.poc_type==1){ | |
| 4112 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 4113 int i; | |
| 4114 | |
| 4115 if(h->sps.poc_cycle_length != 0) | |
| 4116 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 4117 else | |
| 4118 abs_frame_num = 0; | |
| 4119 | |
| 4120 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 4121 abs_frame_num--; | |
| 2967 | 4122 |
| 1168 | 4123 expected_delta_per_poc_cycle = 0; |
| 4124 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 4125 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 4126 | |
| 4127 if(abs_frame_num > 0){ | |
| 4128 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 4129 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 4130 | |
| 4131 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 4132 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 4133 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 4134 } else | |
| 4135 expectedpoc = 0; | |
| 4136 | |
| 2967 | 4137 if(h->nal_ref_idc == 0) |
| 1168 | 4138 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; |
| 2967 | 4139 |
| 1168 | 4140 field_poc[0] = expectedpoc + h->delta_poc[0]; |
| 4141 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 4142 | |
| 4143 if(s->picture_structure == PICT_FRAME) | |
| 4144 field_poc[1] += h->delta_poc[1]; | |
| 4145 }else{ | |
| 4146 int poc; | |
| 4147 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4148 poc= 0; | |
| 4149 }else{ | |
| 4150 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 4151 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 4152 } | |
| 4153 field_poc[0]= poc; | |
| 4154 field_poc[1]= poc; | |
| 4155 } | |
| 2967 | 4156 |
| 1168 | 4157 if(s->picture_structure != PICT_BOTTOM_FIELD) |
| 4158 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 4159 if(s->picture_structure != PICT_TOP_FIELD) | |
| 4160 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 4161 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 4162 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 4163 | |
| 4164 return 0; | |
| 4165 } | |
| 4166 | |
|
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4167 |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4168 /** |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4169 * initialize scan tables |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4170 */ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4171 static void init_scan_tables(H264Context *h){ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4172 MpegEncContext * const s = &h->s; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4173 int i; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4174 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4175 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4176 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4177 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4178 for(i=0; i<16; i++){ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4179 #define T(x) (x>>2) | ((x<<2) & 0xF) |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4180 h->zigzag_scan[i] = T(zigzag_scan[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4181 h-> field_scan[i] = T( field_scan[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4182 #undef T |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4183 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4184 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4185 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4186 memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4187 memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4188 memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4189 memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t)); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4190 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4191 for(i=0; i<64; i++){ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4192 #define T(x) (x>>3) | ((x&7)<<3) |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4193 h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4194 h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4195 h->field_scan8x8[i] = T(field_scan8x8[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4196 h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4197 #undef T |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4198 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4199 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4200 if(h->sps.transform_bypass){ //FIXME same ugly |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4201 h->zigzag_scan_q0 = zigzag_scan; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4202 h->zigzag_scan8x8_q0 = zigzag_scan8x8; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4203 h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4204 h->field_scan_q0 = field_scan; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4205 h->field_scan8x8_q0 = field_scan8x8; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4206 h->field_scan8x8_cavlc_q0 = field_scan8x8_cavlc; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4207 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4208 h->zigzag_scan_q0 = h->zigzag_scan; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4209 h->zigzag_scan8x8_q0 = h->zigzag_scan8x8; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4210 h->zigzag_scan8x8_cavlc_q0 = h->zigzag_scan8x8_cavlc; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4211 h->field_scan_q0 = h->field_scan; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4212 h->field_scan8x8_q0 = h->field_scan8x8; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4213 h->field_scan8x8_cavlc_q0 = h->field_scan8x8_cavlc; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4214 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4215 } |
| 1168 | 4216 /** |
| 4217 * decodes a slice header. | |
| 4218 * this will allso call MPV_common_init() and frame_start() as needed | |
| 4219 */ | |
| 4220 static int decode_slice_header(H264Context *h){ | |
| 4221 MpegEncContext * const s = &h->s; | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4222 unsigned int first_mb_in_slice; |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
4223 unsigned int pps_id; |
| 1168 | 4224 int num_ref_idx_active_override_flag; |
| 4225 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4226 unsigned int slice_type, tmp; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4227 int default_ref_list_done = 0; |
| 1168 | 4228 |
| 4229 s->current_picture.reference= h->nal_ref_idc != 0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
4230 s->dropable= h->nal_ref_idc == 0; |
| 1168 | 4231 |
| 4232 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 4233 | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4234 if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){ |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4235 h->slice_num = 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4236 s->current_picture_ptr= NULL; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4237 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4238 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4239 slice_type= get_ue_golomb(&s->gb); |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4240 if(slice_type > 9){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4241 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y); |
| 2392 | 4242 return -1; |
| 1168 | 4243 } |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4244 if(slice_type > 4){ |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4245 slice_type -= 5; |
| 1168 | 4246 h->slice_type_fixed=1; |
| 4247 }else | |
| 4248 h->slice_type_fixed=0; | |
| 2967 | 4249 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4250 slice_type= slice_type_map[ slice_type ]; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4251 if (slice_type == I_TYPE |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4252 || (h->slice_num != 0 && slice_type == h->slice_type) ) { |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4253 default_ref_list_done = 1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4254 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4255 h->slice_type= slice_type; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4256 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4257 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though |
| 2967 | 4258 |
| 1168 | 4259 pps_id= get_ue_golomb(&s->gb); |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
4260 if(pps_id>=MAX_PPS_COUNT){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4261 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 4262 return -1; |
| 4263 } | |
| 5079 | 4264 if(!h->pps_buffers[pps_id]) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4265 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 4266 return -1; |
| 4267 } | |
| 5079 | 4268 h->pps= *h->pps_buffers[pps_id]; |
| 4269 | |
| 4270 if(!h->sps_buffers[h->pps.sps_id]) { | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4271 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 4272 return -1; |
| 4273 } | |
| 5079 | 4274 h->sps = *h->sps_buffers[h->pps.sps_id]; |
| 2919 | 4275 |
| 4363 | 4276 if(h->dequant_coeff_pps != pps_id){ |
| 4277 h->dequant_coeff_pps = pps_id; | |
| 2919 | 4278 init_dequant_tables(h); |
| 4279 } | |
| 2967 | 4280 |
| 1168 | 4281 s->mb_width= h->sps.mb_width; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4282 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
| 2967 | 4283 |
| 3178 | 4284 h->b_stride= s->mb_width*4; |
| 4285 h->b8_stride= s->mb_width*2; | |
| 1168 | 4286 |
| 1371 | 4287 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 4288 if(h->sps.frame_mbs_only_flag) |
| 1371 | 4289 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 4290 else |
| 1371 | 4291 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 2967 | 4292 |
| 4293 if (s->context_initialized | |
| 1548 | 4294 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 4295 free_tables(h); |
| 4296 MPV_common_end(s); | |
| 4297 } | |
| 4298 if (!s->context_initialized) { | |
| 4299 if (MPV_common_init(s) < 0) | |
| 4300 return -1; | |
| 2967 | 4301 |
|
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4302 init_scan_tables(h); |
| 1168 | 4303 alloc_tables(h); |
| 4304 | |
| 4305 s->avctx->width = s->width; | |
| 4306 s->avctx->height = s->height; | |
| 1548 | 4307 s->avctx->sample_aspect_ratio= h->sps.sar; |
| 2440 | 4308 if(!s->avctx->sample_aspect_ratio.den) |
| 4309 s->avctx->sample_aspect_ratio.den = 1; | |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
4310 |
| 2648 | 4311 if(h->sps.timing_info_present_flag){ |
| 3052 | 4312 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale}; |
|
3063
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4313 if(h->x264_build > 0 && h->x264_build < 44) |
|
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4314 s->avctx->time_base.den *= 2; |
|
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4315 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den, |
|
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4316 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30); |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
4317 } |
| 1168 | 4318 } |
| 4319 | |
| 2392 | 4320 if(h->slice_num == 0){ |
| 2935 | 4321 if(frame_start(h) < 0) |
| 4322 return -1; | |
| 1168 | 4323 } |
| 4324 | |
| 1169 | 4325 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 4326 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 4327 | |
| 3316 | 4328 h->mb_mbaff = 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4329 h->mb_aff_frame = 0; |
| 1168 | 4330 if(h->sps.frame_mbs_only_flag){ |
| 4331 s->picture_structure= PICT_FRAME; | |
| 4332 }else{ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4333 if(get_bits1(&s->gb)) { //field_pic_flag |
| 1168 | 4334 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
| 3316 | 4335 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n"); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4336 } else { |
| 1168 | 4337 s->picture_structure= PICT_FRAME; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4338 h->mb_aff_frame = h->sps.mb_aff; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4339 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4340 } |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4341 assert(s->mb_num == s->mb_width * s->mb_height); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4342 if(first_mb_in_slice << h->mb_aff_frame >= s->mb_num || |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4343 first_mb_in_slice >= s->mb_num){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4344 av_log(h->s.avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4345 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4346 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4347 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
| 3316 | 4348 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << h->mb_aff_frame; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4349 assert(s->mb_y < s->mb_height); |
| 2967 | 4350 |
| 1168 | 4351 if(s->picture_structure==PICT_FRAME){ |
| 4352 h->curr_pic_num= h->frame_num; | |
| 4353 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 4354 }else{ | |
| 4355 h->curr_pic_num= 2*h->frame_num; | |
| 4356 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 4357 } | |
| 2967 | 4358 |
| 1168 | 4359 if(h->nal_unit_type == NAL_IDR_SLICE){ |
| 1453 | 4360 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 4361 } |
| 2967 | 4362 |
| 1168 | 4363 if(h->sps.poc_type==0){ |
| 4364 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 2967 | 4365 |
| 1168 | 4366 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ |
| 4367 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 4368 } | |
| 4369 } | |
| 2967 | 4370 |
| 1168 | 4371 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ |
| 4372 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 2967 | 4373 |
| 1168 | 4374 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) |
| 4375 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 4376 } | |
| 2967 | 4377 |
| 1168 | 4378 init_poc(h); |
| 2967 | 4379 |
| 1168 | 4380 if(h->pps.redundant_pic_cnt_present){ |
| 4381 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 4382 } | |
| 4383 | |
| 4384 //set defaults, might be overriden a few line later | |
| 4385 h->ref_count[0]= h->pps.ref_count[0]; | |
| 4386 h->ref_count[1]= h->pps.ref_count[1]; | |
| 4387 | |
| 4388 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 4389 if(h->slice_type == B_TYPE){ | |
| 4390 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 3316 | 4391 if(h->sps.mb_aff && h->direct_spatial_mv_pred) |
| 4392 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n"); | |
| 1168 | 4393 } |
| 4394 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 2967 | 4395 |
| 1168 | 4396 if(num_ref_idx_active_override_flag){ |
| 4397 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 4398 if(h->slice_type==B_TYPE) | |
| 4399 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4400 | |
| 4532 | 4401 if(h->ref_count[0]-1 > 32-1 || h->ref_count[1]-1 > 32-1){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4402 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4403 h->ref_count[0]= h->ref_count[1]= 1; |
| 1168 | 4404 return -1; |
| 4405 } | |
| 4406 } | |
| 4532 | 4407 if(h->slice_type == B_TYPE) |
| 4408 h->list_count= 2; | |
| 4409 else | |
| 4410 h->list_count= 1; | |
| 4411 }else | |
| 4412 h->list_count= 0; | |
| 1168 | 4413 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4414 if(!default_ref_list_done){ |
| 1168 | 4415 fill_default_ref_list(h); |
| 4416 } | |
| 4417 | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4418 if(decode_ref_pic_list_reordering(h) < 0) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4419 return -1; |
| 1168 | 4420 |
| 2967 | 4421 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) |
| 1168 | 4422 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) |
| 4423 pred_weight_table(h); | |
| 2415 | 4424 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 4425 implicit_weight_table(h); | |
| 4426 else | |
| 4427 h->use_weight = 0; | |
| 2967 | 4428 |
|
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
4429 if(s->current_picture.reference) |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4430 decode_ref_pic_marking(h, &s->gb); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4431 |
| 3316 | 4432 if(FRAME_MBAFF) |
| 4433 fill_mbaff_ref_list(h); | |
| 4434 | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4435 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac ){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4436 tmp = get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4437 if(tmp > 2){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4438 av_log(s->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4439 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4440 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4441 h->cabac_init_idc= tmp; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4442 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4443 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4444 h->last_qscale_diff = 0; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4445 tmp = h->pps.init_qp + get_se_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4446 if(tmp>51){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4447 av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); |
| 1898 | 4448 return -1; |
| 4449 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4450 s->qscale= tmp; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4451 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 4452 //FIXME qscale / qp ... stuff |
| 4453 if(h->slice_type == SP_TYPE){ | |
| 1453 | 4454 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 4455 } |
| 4456 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 4457 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 4458 } |
| 4459 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4460 h->deblocking_filter = 1; |
| 1898 | 4461 h->slice_alpha_c0_offset = 0; |
| 4462 h->slice_beta_offset = 0; | |
| 1168 | 4463 if( h->pps.deblocking_filter_parameters_present ) { |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4464 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4465 if(tmp > 2){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4466 av_log(s->avctx, AV_LOG_ERROR, "deblocking_filter_idc %u out of range\n", tmp); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4467 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4468 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4469 h->deblocking_filter= tmp; |
| 2967 | 4470 if(h->deblocking_filter < 2) |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4471 h->deblocking_filter^= 1; // 1<->0 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4472 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4473 if( h->deblocking_filter ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4474 h->slice_alpha_c0_offset = get_se_golomb(&s->gb) << 1; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4475 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 4476 } |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4477 } |
| 2792 | 4478 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
| 4479 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) | |
| 4480 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE) | |
| 4481 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) | |
| 4482 h->deblocking_filter= 0; | |
| 1168 | 4483 |
| 4484 #if 0 //FMO | |
| 4485 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 4486 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 4487 #endif | |
| 4488 | |
| 2392 | 4489 h->slice_num++; |
| 4490 | |
| 3316 | 4491 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; |
| 4492 h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width; | |
| 4493 | |
| 1168 | 4494 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
4495 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n", |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4496 h->slice_num, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4497 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
| 2967 | 4498 first_mb_in_slice, |
| 1264 | 4499 av_get_pict_type_char(h->slice_type), |
| 1168 | 4500 pps_id, h->frame_num, |
| 4501 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 4502 h->ref_count[0], h->ref_count[1], | |
| 4503 s->qscale, | |
| 2583 | 4504 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
| 2415 | 4505 h->use_weight, |
| 4506 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
| 1168 | 4507 ); |
| 4508 } | |
| 4509 | |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4510 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !s->current_picture.reference){ |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4511 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4512 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4513 }else{ |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4514 s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4515 s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4516 } |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4517 |
| 1168 | 4518 return 0; |
| 4519 } | |
| 4520 | |
| 4521 /** | |
| 4522 * | |
| 4523 */ | |
| 4524 static inline int get_level_prefix(GetBitContext *gb){ | |
| 4525 unsigned int buf; | |
| 4526 int log; | |
| 2967 | 4527 |
| 1168 | 4528 OPEN_READER(re, gb); |
| 4529 UPDATE_CACHE(re, gb); | |
| 4530 buf=GET_CACHE(re, gb); | |
| 2967 | 4531 |
| 1168 | 4532 log= 32 - av_log2(buf); |
| 4533 #ifdef TRACE | |
| 4534 print_bin(buf>>(32-log), log); | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
4535 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__); |
| 1168 | 4536 #endif |
| 4537 | |
| 4538 LAST_SKIP_BITS(re, gb, log); | |
| 4539 CLOSE_READER(re, gb); | |
| 4540 | |
| 4541 return log-1; | |
| 4542 } | |
| 4543 | |
| 2755 | 4544 static inline int get_dct8x8_allowed(H264Context *h){ |
| 4545 int i; | |
| 4546 for(i=0; i<4; i++){ | |
| 4547 if(!IS_SUB_8X8(h->sub_mb_type[i]) | |
|
2781
899a2ea0907c
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents:
2774
diff
changeset
|
4548 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))) |
| 2755 | 4549 return 0; |
| 4550 } | |
| 4551 return 1; | |
| 4552 } | |
| 4553 | |
| 1168 | 4554 /** |
| 4555 * decodes a residual block. | |
| 4556 * @param n block index | |
| 4557 * @param scantable scantable | |
| 4558 * @param max_coeff number of coefficients in the block | |
| 4559 * @return <0 if an error occured | |
| 4560 */ | |
| 2919 | 4561 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ |
| 1168 | 4562 MpegEncContext * const s = &h->s; |
| 4563 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}; | |
| 2897 | 4564 int level[16]; |
| 4565 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before; | |
| 1168 | 4566 |
| 4567 //FIXME put trailing_onex into the context | |
| 4568 | |
| 4569 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 4570 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 4571 total_coeff= coeff_token>>2; | |
| 2967 | 4572 }else{ |
| 1168 | 4573 if(n == LUMA_DC_BLOCK_INDEX){ |
| 4574 total_coeff= pred_non_zero_count(h, 0); | |
| 4575 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4576 total_coeff= coeff_token>>2; | |
| 4577 }else{ | |
| 4578 total_coeff= pred_non_zero_count(h, n); | |
| 4579 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4580 total_coeff= coeff_token>>2; | |
| 4581 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 4582 } | |
| 4583 } | |
| 4584 | |
| 4585 //FIXME set last_non_zero? | |
| 4586 | |
| 4587 if(total_coeff==0) | |
| 4588 return 0; | |
|
4391
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4589 if(total_coeff > (unsigned)max_coeff) { |
|
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4590 av_log(h->s.avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", s->mb_x, s->mb_y, total_coeff); |
| 4270 | 4591 return -1; |
| 4592 } | |
| 2967 | 4593 |
| 1168 | 4594 trailing_ones= coeff_token&3; |
| 4600 | 4595 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 4596 assert(total_coeff<=16); |
| 2967 | 4597 |
| 1168 | 4598 for(i=0; i<trailing_ones; i++){ |
| 4599 level[i]= 1 - 2*get_bits1(gb); | |
| 4600 } | |
| 4601 | |
| 2897 | 4602 if(i<total_coeff) { |
| 1168 | 4603 int level_code, mask; |
| 2897 | 4604 int suffix_length = total_coeff > 10 && trailing_ones < 3; |
| 4605 int prefix= get_level_prefix(gb); | |
| 4606 | |
| 4607 //first coefficient has suffix_length equal to 0 or 1 | |
| 1168 | 4608 if(prefix<14){ //FIXME try to build a large unified VLC table for all this |
| 4609 if(suffix_length) | |
| 4610 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4611 else | |
| 4612 level_code= (prefix<<suffix_length); //part | |
| 4613 }else if(prefix==14){ | |
| 4614 if(suffix_length) | |
| 4615 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4616 else | |
| 4617 level_code= prefix + get_bits(gb, 4); //part | |
| 4618 }else if(prefix==15){ | |
| 4619 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4620 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
| 1168 | 4621 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4622 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4623 return -1; |
| 4624 } | |
| 4625 | |
| 2897 | 4626 if(trailing_ones < 3) level_code += 2; |
| 4627 | |
| 4628 suffix_length = 1; | |
| 4629 if(level_code > 5) | |
| 4630 suffix_length++; | |
| 1168 | 4631 mask= -(level_code&1); |
| 4632 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 2897 | 4633 i++; |
| 4634 | |
| 4635 //remaining coefficients have suffix_length > 0 | |
| 4636 for(;i<total_coeff;i++) { | |
| 4637 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX }; | |
| 4638 prefix = get_level_prefix(gb); | |
| 4639 if(prefix<15){ | |
| 4640 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length); | |
| 4641 }else if(prefix==15){ | |
| 4642 level_code = (prefix<<suffix_length) + get_bits(gb, 12); | |
| 4643 }else{ | |
| 4644 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); | |
| 4645 return -1; | |
| 4646 } | |
| 4647 mask= -(level_code&1); | |
| 4648 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 4649 if(level_code > suffix_limit[suffix_length]) | |
| 4650 suffix_length++; | |
| 4651 } | |
| 1168 | 4652 } |
| 4653 | |
| 4654 if(total_coeff == max_coeff) | |
| 4655 zeros_left=0; | |
| 4656 else{ | |
| 4657 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 4658 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 4659 else | |
| 4660 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 4661 } | |
| 2897 | 4662 |
| 4663 coeff_num = zeros_left + total_coeff - 1; | |
| 4664 j = scantable[coeff_num]; | |
| 4665 if(n > 24){ | |
| 4666 block[j] = level[0]; | |
| 4667 for(i=1;i<total_coeff;i++) { | |
| 4668 if(zeros_left <= 0) | |
| 4669 run_before = 0; | |
| 4670 else if(zeros_left < 7){ | |
| 4671 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4672 }else{ | |
| 4673 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4674 } | |
| 4675 zeros_left -= run_before; | |
| 4676 coeff_num -= 1 + run_before; | |
| 4677 j= scantable[ coeff_num ]; | |
| 4678 | |
| 4679 block[j]= level[i]; | |
| 4680 } | |
| 4681 }else{ | |
| 2919 | 4682 block[j] = (level[0] * qmul[j] + 32)>>6; |
| 2897 | 4683 for(i=1;i<total_coeff;i++) { |
| 4684 if(zeros_left <= 0) | |
| 4685 run_before = 0; | |
| 4686 else if(zeros_left < 7){ | |
| 4687 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4688 }else{ | |
| 4689 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4690 } | |
| 4691 zeros_left -= run_before; | |
| 4692 coeff_num -= 1 + run_before; | |
| 4693 j= scantable[ coeff_num ]; | |
| 4694 | |
| 2919 | 4695 block[j]= (level[i] * qmul[j] + 32)>>6; |
| 2897 | 4696 } |
| 1168 | 4697 } |
| 4698 | |
| 4699 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4700 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4701 return -1; |
| 4702 } | |
| 2897 | 4703 |
| 1168 | 4704 return 0; |
| 4705 } | |
| 4706 | |
| 3316 | 4707 static void predict_field_decoding_flag(H264Context *h){ |
| 4708 MpegEncContext * const s = &h->s; | |
| 4709 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
| 4710 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) | |
| 4711 ? s->current_picture.mb_type[mb_xy-1] | |
| 4712 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) | |
| 4713 ? s->current_picture.mb_type[mb_xy-s->mb_stride] | |
| 4714 : 0; | |
| 4715 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; | |
| 4716 } | |
| 4717 | |
| 1168 | 4718 /** |
| 2396 | 4719 * decodes a P_SKIP or B_SKIP macroblock |
| 4720 */ | |
| 4721 static void decode_mb_skip(H264Context *h){ | |
| 4722 MpegEncContext * const s = &h->s; | |
| 4723 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4724 int mb_type=0; |
| 2967 | 4725 |
| 2396 | 4726 memset(h->non_zero_count[mb_xy], 0, 16); |
| 4727 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
| 4728 | |
| 3316 | 4729 if(MB_FIELD) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4730 mb_type|= MB_TYPE_INTERLACED; |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4731 |
| 2396 | 4732 if( h->slice_type == B_TYPE ) |
| 4733 { | |
| 4734 // just for fill_caches. pred_direct_motion will set the real mb_type | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4735 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
| 2396 | 4736 |
| 2449 | 4737 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4738 pred_direct_motion(h, &mb_type); |
| 3927 | 4739 mb_type|= MB_TYPE_SKIP; |
| 2396 | 4740 } |
| 4741 else | |
| 4742 { | |
| 4743 int mx, my; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4744 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
| 2396 | 4745 |
| 2449 | 4746 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4747 pred_pskip_motion(h, &mx, &my); |
| 4748 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 4749 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
| 4750 } | |
| 4751 | |
| 4752 write_back_motion(h, mb_type); | |
| 3927 | 4753 s->current_picture.mb_type[mb_xy]= mb_type; |
| 2396 | 4754 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 4755 h->slice_table[ mb_xy ]= h->slice_num; | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
4756 h->prev_mb_skipped= 1; |
| 2396 | 4757 } |
| 4758 | |
| 4759 /** | |
| 1168 | 4760 * decodes a macroblock |
| 4761 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 4762 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4763 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 4764 MpegEncContext * const s = &h->s; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
4765 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4766 int partition_count; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4767 unsigned int mb_type, cbp; |
| 2755 | 4768 int dct8x8_allowed= h->pps.transform_8x8_mode; |
| 1168 | 4769 |
| 2967 | 4770 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
| 1168 | 4771 |
| 4600 | 4772 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 4773 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 4774 down the code */ | |
| 1168 | 4775 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 4776 if(s->mb_skip_run==-1) | |
| 4777 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 2967 | 4778 |
| 1168 | 4779 if (s->mb_skip_run--) { |
| 3316 | 4780 if(FRAME_MBAFF && (s->mb_y&1) == 0){ |
| 4781 if(s->mb_skip_run==0) | |
| 4782 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
| 4783 else | |
| 4784 predict_field_decoding_flag(h); | |
| 4785 } | |
| 2396 | 4786 decode_mb_skip(h); |
| 1168 | 4787 return 0; |
| 4788 } | |
| 4789 } | |
| 3316 | 4790 if(FRAME_MBAFF){ |
| 4791 if( (s->mb_y&1) == 0 ) | |
| 4792 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
| 1168 | 4793 }else |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4794 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
| 2967 | 4795 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
4796 h->prev_mb_skipped= 0; |
| 2967 | 4797 |
| 1168 | 4798 mb_type= get_ue_golomb(&s->gb); |
| 4799 if(h->slice_type == B_TYPE){ | |
| 4800 if(mb_type < 23){ | |
| 4801 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 4802 mb_type= b_mb_type_info[mb_type].type; | |
| 4803 }else{ | |
| 4804 mb_type -= 23; | |
| 4805 goto decode_intra_mb; | |
| 4806 } | |
| 4807 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 4808 if(mb_type < 5){ | |
| 4809 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 4810 mb_type= p_mb_type_info[mb_type].type; | |
| 4811 }else{ | |
| 4812 mb_type -= 5; | |
| 4813 goto decode_intra_mb; | |
| 4814 } | |
| 4815 }else{ | |
| 4816 assert(h->slice_type == I_TYPE); | |
| 4817 decode_intra_mb: | |
| 4818 if(mb_type > 25){ | |
| 3954 | 4819 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y); |
| 1168 | 4820 return -1; |
| 4821 } | |
| 4822 partition_count=0; | |
| 4823 cbp= i_mb_type_info[mb_type].cbp; | |
| 4824 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 4825 mb_type= i_mb_type_info[mb_type].type; | |
| 4826 } | |
| 4827 | |
| 3316 | 4828 if(MB_FIELD) |
| 1168 | 4829 mb_type |= MB_TYPE_INTERLACED; |
| 4830 | |
| 4831 h->slice_table[ mb_xy ]= h->slice_num; | |
| 2967 | 4832 |
| 1168 | 4833 if(IS_INTRA_PCM(mb_type)){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4834 unsigned int x, y; |
| 2967 | 4835 |
| 5127 | 4836 // We assume these blocks are very rare so we do not optimize it. |
| 1168 | 4837 align_get_bits(&s->gb); |
| 2967 | 4838 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4839 // The pixels are stored in the same order as levels in h->mb array. |
| 1168 | 4840 for(y=0; y<16; y++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4841 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
| 1168 | 4842 for(x=0; x<16; x++){ |
| 4600 | 4843 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4844 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
| 1168 | 4845 } |
| 4846 } | |
| 4847 for(y=0; y<8; y++){ | |
| 4848 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 4849 for(x=0; x<8; x++){ | |
| 4600 | 4850 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4851 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4852 } |
| 4853 } | |
| 4854 for(y=0; y<8; y++){ | |
| 4855 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 4856 for(x=0; x<8; x++){ | |
| 4600 | 4857 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4858 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4859 } |
| 4860 } | |
| 2967 | 4861 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4862 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4863 s->current_picture.qscale_table[mb_xy]= 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4864 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4865 // All coeffs are present |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4866 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2967 | 4867 |
| 2755 | 4868 s->current_picture.mb_type[mb_xy]= mb_type; |
| 1168 | 4869 return 0; |
| 4870 } | |
| 2967 | 4871 |
| 3316 | 4872 if(MB_MBAFF){ |
| 4873 h->ref_count[0] <<= 1; | |
| 4874 h->ref_count[1] <<= 1; | |
| 4875 } | |
| 4876 | |
| 2449 | 4877 fill_caches(h, mb_type, 0); |
| 1168 | 4878 |
| 4879 //mb_pred | |
| 4880 if(IS_INTRA(mb_type)){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4881 int pred_mode; |
| 1168 | 4882 // init_top_left_availability(h); |
| 4883 if(IS_INTRA4x4(mb_type)){ | |
| 4884 int i; | |
| 2755 | 4885 int di = 1; |
| 4886 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
| 4887 mb_type |= MB_TYPE_8x8DCT; | |
| 4888 di = 4; | |
| 4889 } | |
| 1168 | 4890 |
| 4891 // fill_intra4x4_pred_table(h); | |
| 2755 | 4892 for(i=0; i<16; i+=di){ |
| 3409 | 4893 int mode= pred_intra_mode(h, i); |
| 4894 | |
| 4895 if(!get_bits1(&s->gb)){ | |
| 1168 | 4896 const int rem_mode= get_bits(&s->gb, 3); |
| 3409 | 4897 mode = rem_mode + (rem_mode >= mode); |
| 1168 | 4898 } |
| 2967 | 4899 |
| 2755 | 4900 if(di==4) |
| 4901 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 4902 else | |
| 4903 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 1168 | 4904 } |
| 4905 write_back_intra_pred_mode(h); | |
| 4906 if( check_intra4x4_pred_mode(h) < 0) | |
| 4907 return -1; | |
| 4908 }else{ | |
| 4909 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 4910 if(h->intra16x16_pred_mode < 0) | |
| 4911 return -1; | |
| 4912 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4913 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4914 pred_mode= check_intra_pred_mode(h, get_ue_golomb(&s->gb)); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4915 if(pred_mode < 0) |
| 1168 | 4916 return -1; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4917 h->chroma_pred_mode= pred_mode; |
| 1168 | 4918 }else if(partition_count==4){ |
| 4919 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 2967 | 4920 |
| 1168 | 4921 if(h->slice_type == B_TYPE){ |
| 4922 for(i=0; i<4; i++){ | |
| 4923 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4924 if(h->sub_mb_type[i] >=13){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4925 av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y); |
| 1168 | 4926 return -1; |
| 4927 } | |
| 4928 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4929 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4930 } | |
| 2396 | 4931 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 3003 | 4932 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { |
| 2396 | 4933 pred_direct_motion(h, &mb_type); |
| 3003 | 4934 h->ref_cache[0][scan8[4]] = |
| 4935 h->ref_cache[1][scan8[4]] = | |
| 4936 h->ref_cache[0][scan8[12]] = | |
| 4937 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | |
| 4938 } | |
| 1168 | 4939 }else{ |
| 4940 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 4941 for(i=0; i<4; i++){ | |
| 4942 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4943 if(h->sub_mb_type[i] >=4){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4944 av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y); |
| 1168 | 4945 return -1; |
| 4946 } | |
| 4947 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4948 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4949 } | |
| 4950 } | |
| 2967 | 4951 |
| 4533 | 4952 for(list=0; list<h->list_count; list++){ |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4953 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
| 1168 | 4954 for(i=0; i<4; i++){ |
| 2396 | 4955 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 4956 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4957 unsigned int tmp = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4958 if(tmp>=ref_count){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4959 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4960 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4961 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4962 ref[list][i]= tmp; |
| 1168 | 4963 }else{ |
| 4964 //FIXME | |
| 4965 ref[list][i] = -1; | |
| 4966 } | |
| 4967 } | |
| 4968 } | |
| 2967 | 4969 |
| 2755 | 4970 if(dct8x8_allowed) |
| 4971 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 2967 | 4972 |
| 4533 | 4973 for(list=0; list<h->list_count; list++){ |
| 1168 | 4974 for(i=0; i<4; i++){ |
| 3003 | 4975 if(IS_DIRECT(h->sub_mb_type[i])) { |
| 4976 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ]; | |
| 4977 continue; | |
| 4978 } | |
| 1168 | 4979 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
| 4980 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 4981 | |
| 2396 | 4982 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
| 1168 | 4983 const int sub_mb_type= h->sub_mb_type[i]; |
| 4984 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 4985 for(j=0; j<sub_partition_count[i]; j++){ | |
| 4986 int mx, my; | |
| 4987 const int index= 4*i + block_width*j; | |
| 4988 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 4989 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 4990 mx += get_se_golomb(&s->gb); | |
| 4991 my += get_se_golomb(&s->gb); | |
| 4600 | 4992 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 4993 |
| 1168 | 4994 if(IS_SUB_8X8(sub_mb_type)){ |
| 4530 | 4995 mv_cache[ 1 ][0]= |
| 1168 | 4996 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
| 4530 | 4997 mv_cache[ 1 ][1]= |
| 1168 | 4998 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
| 4999 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 4530 | 5000 mv_cache[ 1 ][0]= mx; |
| 5001 mv_cache[ 1 ][1]= my; | |
| 1168 | 5002 }else if(IS_SUB_4X8(sub_mb_type)){ |
| 4530 | 5003 mv_cache[ 8 ][0]= mx; |
| 5004 mv_cache[ 8 ][1]= my; | |
| 1168 | 5005 } |
| 4530 | 5006 mv_cache[ 0 ][0]= mx; |
| 5007 mv_cache[ 0 ][1]= my; | |
| 1168 | 5008 } |
| 5009 }else{ | |
| 5010 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 5011 p[0] = p[1]= | |
| 5012 p[8] = p[9]= 0; | |
| 5013 } | |
| 5014 } | |
| 5015 } | |
| 2396 | 5016 }else if(IS_DIRECT(mb_type)){ |
| 5017 pred_direct_motion(h, &mb_type); | |
| 2755 | 5018 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 5019 }else{ |
| 1168 | 5020 int list, mx, my, i; |
| 5021 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 5022 if(IS_16X16(mb_type)){ | |
| 4534 | 5023 for(list=0; list<h->list_count; list++){ |
| 5024 unsigned int val; | |
| 1168 | 5025 if(IS_DIR(mb_type, 0, list)){ |
| 4534 | 5026 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5027 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5028 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5029 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5030 } |
| 2523 | 5031 }else |
| 4534 | 5032 val= LIST_NOT_USED&0xFF; |
| 5033 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 5034 } | |
| 5035 for(list=0; list<h->list_count; list++){ | |
| 5036 unsigned int val; | |
| 1168 | 5037 if(IS_DIR(mb_type, 0, list)){ |
| 5038 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 5039 mx += get_se_golomb(&s->gb); | |
| 5040 my += get_se_golomb(&s->gb); | |
| 4600 | 5041 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5042 |
| 4534 | 5043 val= pack16to32(mx,my); |
| 2523 | 5044 }else |
| 4534 | 5045 val=0; |
| 5046 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4); | |
| 1168 | 5047 } |
| 5048 } | |
| 5049 else if(IS_16X8(mb_type)){ | |
| 4534 | 5050 for(list=0; list<h->list_count; list++){ |
| 1168 | 5051 for(i=0; i<2; i++){ |
| 4534 | 5052 unsigned int val; |
| 1168 | 5053 if(IS_DIR(mb_type, i, list)){ |
| 4534 | 5054 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5055 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5056 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5057 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5058 } |
| 2523 | 5059 }else |
| 4534 | 5060 val= LIST_NOT_USED&0xFF; |
| 5061 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 1168 | 5062 } |
| 4534 | 5063 } |
| 5064 for(list=0; list<h->list_count; list++){ | |
| 1168 | 5065 for(i=0; i<2; i++){ |
| 4534 | 5066 unsigned int val; |
| 1168 | 5067 if(IS_DIR(mb_type, i, list)){ |
| 5068 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 5069 mx += get_se_golomb(&s->gb); | |
| 5070 my += get_se_golomb(&s->gb); | |
| 4600 | 5071 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5072 |
| 4534 | 5073 val= pack16to32(mx,my); |
| 2396 | 5074 }else |
| 4534 | 5075 val=0; |
| 5076 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4); | |
| 1168 | 5077 } |
| 5078 } | |
| 5079 }else{ | |
| 5080 assert(IS_8X16(mb_type)); | |
| 4534 | 5081 for(list=0; list<h->list_count; list++){ |
| 1168 | 5082 for(i=0; i<2; i++){ |
| 4534 | 5083 unsigned int val; |
| 1168 | 5084 if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
| 4534 | 5085 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5086 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5087 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5088 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5089 } |
| 2523 | 5090 }else |
| 4534 | 5091 val= LIST_NOT_USED&0xFF; |
| 5092 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 1168 | 5093 } |
| 4534 | 5094 } |
| 5095 for(list=0; list<h->list_count; list++){ | |
| 1168 | 5096 for(i=0; i<2; i++){ |
| 4534 | 5097 unsigned int val; |
| 1168 | 5098 if(IS_DIR(mb_type, i, list)){ |
| 5099 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 5100 mx += get_se_golomb(&s->gb); | |
| 5101 my += get_se_golomb(&s->gb); | |
| 4600 | 5102 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5103 |
| 4534 | 5104 val= pack16to32(mx,my); |
| 2396 | 5105 }else |
| 4534 | 5106 val=0; |
| 5107 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4); | |
| 1168 | 5108 } |
| 5109 } | |
| 5110 } | |
| 5111 } | |
| 2967 | 5112 |
| 1168 | 5113 if(IS_INTER(mb_type)) |
| 5114 write_back_motion(h, mb_type); | |
| 2967 | 5115 |
| 1168 | 5116 if(!IS_INTRA16x16(mb_type)){ |
| 5117 cbp= get_ue_golomb(&s->gb); | |
| 5118 if(cbp > 47){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5119 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 5120 return -1; |
| 5121 } | |
| 2967 | 5122 |
| 1168 | 5123 if(IS_INTRA4x4(mb_type)) |
| 5124 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 5125 else | |
| 5126 cbp= golomb_to_inter_cbp[cbp]; | |
| 5127 } | |
| 3651 | 5128 h->cbp = cbp; |
| 1168 | 5129 |
| 2755 | 5130 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
| 5131 if(get_bits1(&s->gb)) | |
| 5132 mb_type |= MB_TYPE_8x8DCT; | |
| 5133 } | |
| 5134 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 5135 | |
| 1168 | 5136 if(cbp || IS_INTRA16x16(mb_type)){ |
| 5137 int i8x8, i4x4, chroma_idx; | |
| 5138 int chroma_qp, dquant; | |
| 5139 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
| 3174 | 5140 const uint8_t *scan, *scan8x8, *dc_scan; |
| 2967 | 5141 |
| 1168 | 5142 // fill_non_zero_count_cache(h); |
| 5143 | |
| 5144 if(IS_INTERLACED(mb_type)){ | |
| 3316 | 5145 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0; |
| 2763 | 5146 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
| 1168 | 5147 dc_scan= luma_dc_field_scan; |
| 5148 }else{ | |
| 3316 | 5149 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0; |
| 2763 | 5150 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
| 1168 | 5151 dc_scan= luma_dc_zigzag_scan; |
| 5152 } | |
| 5153 | |
| 5154 dquant= get_se_golomb(&s->gb); | |
| 5155 | |
| 5156 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5157 av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y); |
| 1168 | 5158 return -1; |
| 5159 } | |
| 2967 | 5160 |
| 1168 | 5161 s->qscale += dquant; |
| 5162 if(((unsigned)s->qscale) > 51){ | |
| 5163 if(s->qscale<0) s->qscale+= 52; | |
| 5164 else s->qscale-= 52; | |
| 5165 } | |
| 2967 | 5166 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5167 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 5168 if(IS_INTRA16x16(mb_type)){ |
| 2919 | 5169 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[0][s->qscale], 16) < 0){ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5170 return -1; //FIXME continue if partitioned and other return -1 too |
| 1168 | 5171 } |
| 5172 | |
| 5173 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 5174 | |
| 5175 if(cbp&15){ | |
| 5176 for(i8x8=0; i8x8<4; i8x8++){ | |
| 5177 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5178 const int index= i4x4 + 4*i8x8; | |
| 2919 | 5179 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){ |
| 1168 | 5180 return -1; |
| 5181 } | |
| 5182 } | |
| 5183 } | |
| 5184 }else{ | |
| 1636 | 5185 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 5186 } |
| 5187 }else{ | |
| 5188 for(i8x8=0; i8x8<4; i8x8++){ | |
| 5189 if(cbp & (1<<i8x8)){ | |
| 2755 | 5190 if(IS_8x8DCT(mb_type)){ |
| 5191 DCTELEM *buf = &h->mb[64*i8x8]; | |
| 2757 | 5192 uint8_t *nnz; |
| 2755 | 5193 for(i4x4=0; i4x4<4; i4x4++){ |
| 3174 | 5194 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4, |
| 2919 | 5195 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 ) |
| 2755 | 5196 return -1; |
| 5197 } | |
| 2757 | 5198 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
5199 nnz[0] += nnz[1] + nnz[8] + nnz[9]; |
| 2755 | 5200 }else{ |
| 5201 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5202 const int index= i4x4 + 4*i8x8; | |
| 2967 | 5203 |
| 2919 | 5204 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) <0 ){ |
| 2755 | 5205 return -1; |
| 5206 } | |
| 1168 | 5207 } |
| 5208 } | |
| 5209 }else{ | |
| 5210 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 5211 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 5212 } | |
| 5213 } | |
| 5214 } | |
| 2967 | 5215 |
| 1168 | 5216 if(cbp&0x30){ |
| 5217 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 2919 | 5218 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){ |
| 1168 | 5219 return -1; |
| 5220 } | |
| 5221 } | |
| 5222 | |
| 5223 if(cbp&0x20){ | |
| 5224 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
| 5225 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5226 const int index= 16 + 4*chroma_idx + i4x4; | |
| 2919 | 5227 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][chroma_qp], 15) < 0){ |
| 1168 | 5228 return -1; |
| 5229 } | |
| 5230 } | |
| 5231 } | |
| 5232 }else{ | |
| 5233 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 5234 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 5235 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 5236 } | |
| 5237 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5238 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5239 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5240 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5241 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 5242 } |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5243 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 5244 write_back_non_zero_count(h); |
| 5245 | |
| 3316 | 5246 if(MB_MBAFF){ |
| 5247 h->ref_count[0] >>= 1; | |
| 5248 h->ref_count[1] >>= 1; | |
| 5249 } | |
| 5250 | |
| 1168 | 5251 return 0; |
| 5252 } | |
| 5253 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5254 static int decode_cabac_field_decoding_flag(H264Context *h) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5255 MpegEncContext * const s = &h->s; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5256 const int mb_x = s->mb_x; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5257 const int mb_y = s->mb_y & ~1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5258 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5259 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5260 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5261 unsigned int ctx = 0; |
| 2967 | 5262 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5263 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5264 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5265 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5266 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5267 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5268 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5269 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5270 return get_cabac_noinline( &h->cabac, &h->cabac_state[70 + ctx] ); |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5271 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5272 |
| 2312 | 5273 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
| 5274 uint8_t *state= &h->cabac_state[ctx_base]; | |
| 5275 int mb_type; | |
| 2967 | 5276 |
| 2312 | 5277 if(intra_slice){ |
| 5278 MpegEncContext * const s = &h->s; | |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5279 const int mba_xy = h->left_mb_xy[0]; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5280 const int mbb_xy = h->top_mb_xy; |
| 2312 | 5281 int ctx=0; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5282 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5283 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5284 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5285 ctx++; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5286 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 ) |
| 2312 | 5287 return 0; /* I4x4 */ |
| 5288 state += 2; | |
| 5289 }else{ | |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5290 if( get_cabac_noinline( &h->cabac, &state[0] ) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5291 return 0; /* I4x4 */ |
| 2312 | 5292 } |
| 5293 | |
| 5294 if( get_cabac_terminate( &h->cabac ) ) | |
| 5295 return 25; /* PCM */ | |
| 5296 | |
| 5297 mb_type = 1; /* I16x16 */ | |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5298 mb_type += 12 * get_cabac_noinline( &h->cabac, &state[1] ); /* cbp_luma != 0 */ |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5299 if( get_cabac_noinline( &h->cabac, &state[2] ) ) /* cbp_chroma */ |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5300 mb_type += 4 + 4 * get_cabac_noinline( &h->cabac, &state[2+intra_slice] ); |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5301 mb_type += 2 * get_cabac_noinline( &h->cabac, &state[3+intra_slice] ); |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5302 mb_type += 1 * get_cabac_noinline( &h->cabac, &state[3+2*intra_slice] ); |
| 2312 | 5303 return mb_type; |
| 5304 } | |
| 5305 | |
| 5306 static int decode_cabac_mb_type( H264Context *h ) { | |
| 5307 MpegEncContext * const s = &h->s; | |
| 5308 | |
| 5309 if( h->slice_type == I_TYPE ) { | |
| 5310 return decode_cabac_intra_mb_type(h, 3, 1); | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5311 } else if( h->slice_type == P_TYPE ) { |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5312 if( get_cabac_noinline( &h->cabac, &h->cabac_state[14] ) == 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5313 /* P-type */ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5314 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
| 3138 | 5315 /* P_L0_D16x16, P_8x8 */ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5316 return 3 * get_cabac_noinline( &h->cabac, &h->cabac_state[16] ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5317 } else { |
| 3138 | 5318 /* P_L0_D8x16, P_L0_D16x8 */ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5319 return 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5320 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5321 } else { |
| 2312 | 5322 return decode_cabac_intra_mb_type(h, 17, 0) + 5; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5323 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5324 } else if( h->slice_type == B_TYPE ) { |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5325 const int mba_xy = h->left_mb_xy[0]; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5326 const int mbb_xy = h->top_mb_xy; |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5327 int ctx = 0; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5328 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5329 |
| 3138 | 5330 if( h->slice_table[mba_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) ) |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5331 ctx++; |
| 3138 | 5332 if( h->slice_table[mbb_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) ) |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5333 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5334 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5335 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+ctx] ) ) |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5336 return 0; /* B_Direct_16x16 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5337 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5338 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+3] ) ) { |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5339 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */ |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5340 } |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5341 |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5342 bits = get_cabac_noinline( &h->cabac, &h->cabac_state[27+4] ) << 3; |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5343 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 2; |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5344 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 1; |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5345 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5346 if( bits < 8 ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5347 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5348 else if( bits == 13 ) { |
| 2312 | 5349 return decode_cabac_intra_mb_type(h, 32, 0) + 23; |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5350 } else if( bits == 14 ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5351 return 11; /* B_L1_L0_8x16 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5352 else if( bits == 15 ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5353 return 22; /* B_8x8 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5354 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5355 bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5356 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5357 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5358 /* TODO SI/SP frames? */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5359 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5360 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5361 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5362 |
| 3316 | 5363 static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5364 MpegEncContext * const s = &h->s; |
| 3316 | 5365 int mba_xy, mbb_xy; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5366 int ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5367 |
| 3316 | 5368 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches? |
| 5369 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride; | |
| 5370 mba_xy = mb_xy - 1; | |
| 5371 if( (mb_y&1) | |
| 5372 && h->slice_table[mba_xy] == h->slice_num | |
| 5373 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) | |
| 5374 mba_xy += s->mb_stride; | |
| 5375 if( MB_FIELD ){ | |
| 5376 mbb_xy = mb_xy - s->mb_stride; | |
| 5377 if( !(mb_y&1) | |
| 5378 && h->slice_table[mbb_xy] == h->slice_num | |
| 5379 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) | |
| 5380 mbb_xy -= s->mb_stride; | |
| 5381 }else | |
| 5382 mbb_xy = mb_x + (mb_y-1)*s->mb_stride; | |
| 5383 }else{ | |
| 5384 int mb_xy = mb_x + mb_y*s->mb_stride; | |
| 5385 mba_xy = mb_xy - 1; | |
| 5386 mbb_xy = mb_xy - s->mb_stride; | |
| 5387 } | |
| 5388 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5389 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] )) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5390 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5391 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] )) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5392 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5393 |
| 3138 | 5394 if( h->slice_type == B_TYPE ) |
| 5395 ctx += 13; | |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5396 return get_cabac_noinline( &h->cabac, &h->cabac_state[11+ctx] ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5397 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5398 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5399 static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5400 int mode = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5401 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5402 if( get_cabac( &h->cabac, &h->cabac_state[68] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5403 return pred_mode; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5404 |
| 2928 | 5405 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
| 5406 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
| 5407 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
| 5408 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5409 if( mode >= pred_mode ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5410 return mode + 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5411 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5412 return mode; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5413 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5414 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5415 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5416 const int mba_xy = h->left_mb_xy[0]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5417 const int mbb_xy = h->top_mb_xy; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5418 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5419 int ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5420 |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5421 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5422 if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5423 ctx++; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5424 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5425 if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5426 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5427 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5428 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+ctx] ) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5429 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5430 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5431 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5432 return 1; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5433 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5434 return 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5435 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5436 return 3; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5437 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5438 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5439 static const uint8_t block_idx_x[16] = { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5440 0, 1, 0, 1, 2, 3, 2, 3, 0, 1, 0, 1, 2, 3, 2, 3 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5441 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5442 static const uint8_t block_idx_y[16] = { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5443 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5444 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5445 static const uint8_t block_idx_xy[4][4] = { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5446 { 0, 2, 8, 10}, |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5447 { 1, 3, 9, 11}, |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5448 { 4, 6, 12, 14}, |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5449 { 5, 7, 13, 15} |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5450 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5451 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5452 static int decode_cabac_mb_cbp_luma( H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5453 int cbp = 0; |
| 3138 | 5454 int cbp_b = -1; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5455 int i8x8; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5456 |
| 3138 | 5457 if( h->slice_table[h->top_mb_xy] == h->slice_num ) { |
| 5458 cbp_b = h->top_cbp; | |
| 4600 | 5459 tprintf(h->s.avctx, "cbp_b = top_cbp = %x\n", cbp_b); |
| 3138 | 5460 } |
| 5461 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5462 for( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5463 int cbp_a = -1; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5464 int x, y; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5465 int ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5466 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5467 x = block_idx_x[4*i8x8]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5468 y = block_idx_y[4*i8x8]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5469 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5470 if( x > 0 ) |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5471 cbp_a = cbp; |
| 3138 | 5472 else if( h->slice_table[h->left_mb_xy[0]] == h->slice_num ) { |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5473 cbp_a = h->left_cbp; |
| 4600 | 5474 tprintf(h->s.avctx, "cbp_a = left_cbp = %x\n", cbp_a); |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5475 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5476 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5477 if( y > 0 ) |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5478 cbp_b = cbp; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5479 |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5480 /* No need to test for skip as we put 0 for skip block */ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5481 /* No need to test for IPCM as we put 1 for IPCM block */ |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5482 if( cbp_a >= 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5483 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5484 if( ((cbp_a >> i8x8a)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5485 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5486 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5487 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5488 if( cbp_b >= 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5489 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5490 if( ((cbp_b >> i8x8b)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5491 ctx += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5492 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5493 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5494 if( get_cabac( &h->cabac, &h->cabac_state[73 + ctx] ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5495 cbp |= 1 << i8x8; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5496 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5497 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5498 return cbp; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5499 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5500 static int decode_cabac_mb_cbp_chroma( H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5501 int ctx; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5502 int cbp_a, cbp_b; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5503 |
| 2314 | 5504 cbp_a = (h->left_cbp>>4)&0x03; |
| 5505 cbp_b = (h-> top_cbp>>4)&0x03; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5506 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5507 ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5508 if( cbp_a > 0 ) ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5509 if( cbp_b > 0 ) ctx += 2; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5510 if( get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5511 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5512 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5513 ctx = 4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5514 if( cbp_a == 2 ) ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5515 if( cbp_b == 2 ) ctx += 2; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5516 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5517 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5518 static int decode_cabac_mb_dqp( H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5519 MpegEncContext * const s = &h->s; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5520 int mbn_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5521 int ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5522 int val = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5523 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5524 if( s->mb_x > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5525 mbn_xy = s->mb_x + s->mb_y*s->mb_stride - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5526 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5527 mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5528 |
| 3316 | 5529 if( h->last_qscale_diff != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5530 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5531 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5532 while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5533 if( ctx < 2 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5534 ctx = 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5535 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5536 ctx = 3; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5537 val++; |
| 3128 | 5538 if(val > 102) //prevent infinite loop |
|
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
5539 return INT_MIN; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5540 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5541 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5542 if( val&0x01 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5543 return (val + 1)/2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5544 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5545 return -(val + 1)/2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5546 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5547 static int decode_cabac_p_mb_sub_type( H264Context *h ) { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5548 if( get_cabac( &h->cabac, &h->cabac_state[21] ) ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5549 return 0; /* 8x8 */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5550 if( !get_cabac( &h->cabac, &h->cabac_state[22] ) ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5551 return 1; /* 8x4 */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5552 if( get_cabac( &h->cabac, &h->cabac_state[23] ) ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5553 return 2; /* 4x8 */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5554 return 3; /* 4x4 */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5555 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5556 static int decode_cabac_b_mb_sub_type( H264Context *h ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5557 int type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5558 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5559 return 0; /* B_Direct_8x8 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5560 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) ) |
|
2311
cdbb2f30e08b
small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
2310
diff
changeset
|
5561 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */ |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5562 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5563 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5564 if( get_cabac( &h->cabac, &h->cabac_state[39] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5565 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5566 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5567 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5568 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] ); |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5569 type += get_cabac( &h->cabac, &h->cabac_state[39] ); |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5570 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5571 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5572 |
| 2755 | 5573 static inline int decode_cabac_mb_transform_size( H264Context *h ) { |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5574 return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); |
| 2755 | 5575 } |
| 5576 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5577 static int decode_cabac_mb_ref( H264Context *h, int list, int n ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5578 int refa = h->ref_cache[list][scan8[n] - 1]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5579 int refb = h->ref_cache[list][scan8[n] - 8]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5580 int ref = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5581 int ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5582 |
| 2396 | 5583 if( h->slice_type == B_TYPE) { |
| 5584 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
| 5585 ctx++; | |
| 5586 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
| 5587 ctx += 2; | |
| 5588 } else { | |
| 5589 if( refa > 0 ) | |
| 5590 ctx++; | |
| 5591 if( refb > 0 ) | |
| 5592 ctx += 2; | |
| 5593 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5594 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5595 while( get_cabac( &h->cabac, &h->cabac_state[54+ctx] ) ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5596 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5597 if( ctx < 4 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5598 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5599 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5600 ctx = 5; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5601 if(ref >= 32 /*h->ref_list[list]*/){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5602 av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_ref\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5603 return 0; //FIXME we should return -1 and check the return everywhere |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5604 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5605 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5606 return ref; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5607 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5608 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5609 static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5610 int amvd = abs( h->mvd_cache[list][scan8[n] - 1][l] ) + |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5611 abs( h->mvd_cache[list][scan8[n] - 8][l] ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5612 int ctxbase = (l == 0) ? 40 : 47; |
| 2317 | 5613 int ctx, mvd; |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5614 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5615 if( amvd < 3 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5616 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5617 else if( amvd > 32 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5618 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5619 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5620 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5621 |
| 2317 | 5622 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
| 5623 return 0; | |
| 5624 | |
| 5625 mvd= 1; | |
| 5626 ctx= 3; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5627 while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5628 mvd++; |
| 2317 | 5629 if( ctx < 6 ) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5630 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5631 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5632 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5633 if( mvd >= 9 ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5634 int k = 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5635 while( get_cabac_bypass( &h->cabac ) ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5636 mvd += 1 << k; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5637 k++; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5638 if(k>24){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5639 av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5640 return INT_MIN; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5641 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5642 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5643 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5644 if( get_cabac_bypass( &h->cabac ) ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5645 mvd += 1 << k; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5646 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5647 } |
| 4042 | 5648 return get_cabac_bypass_sign( &h->cabac, -mvd ); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5649 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5650 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
5651 static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
| 2314 | 5652 int nza, nzb; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5653 int ctx = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5654 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5655 if( cat == 0 ) { |
| 2314 | 5656 nza = h->left_cbp&0x100; |
| 5657 nzb = h-> top_cbp&0x100; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5658 } else if( cat == 1 || cat == 2 ) { |
| 2314 | 5659 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
| 5660 nzb = h->non_zero_count_cache[scan8[idx] - 8]; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5661 } else if( cat == 3 ) { |
| 2314 | 5662 nza = (h->left_cbp>>(6+idx))&0x01; |
| 5663 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
| 5664 } else { | |
| 5665 assert(cat == 4); | |
| 5666 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
| 5667 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
| 5668 } | |
| 5669 | |
| 5670 if( nza > 0 ) | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5671 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5672 |
| 2314 | 5673 if( nzb > 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5674 ctx += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5675 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5676 return ctx + 4 * cat; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5677 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5678 |
|
5006
28ebdd244a07
Change some leftover __attribute__((unused)) and __attribute__((used)) to
reimar
parents:
4984
diff
changeset
|
5679 static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = { |
| 4051 | 5680 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 5681 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
| 5682 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
| 5683 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
| 5684 }; | |
| 5685 | |
| 3028 | 5686 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5687 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
| 3316 | 5688 static const int significant_coeff_flag_offset[2][6] = { |
| 5689 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 }, | |
| 5690 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 } | |
| 5691 }; | |
| 5692 static const int last_coeff_flag_offset[2][6] = { | |
| 5693 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 }, | |
| 5694 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 } | |
| 5695 }; | |
| 5696 static const int coeff_abs_level_m1_offset[6] = { | |
| 5697 227+0, 227+10, 227+20, 227+30, 227+39, 426 | |
| 5698 }; | |
| 4007 | 5699 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = { |
| 3316 | 5700 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, |
| 2755 | 5701 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, |
| 5702 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
| 3316 | 5703 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 }, |
| 5704 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5, | |
| 5705 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11, | |
| 5706 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9, | |
| 5707 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 } | |
| 2755 | 5708 }; |
| 5709 | |
| 5710 int index[64]; | |
| 2313 | 5711 |
|
4041
0113ceb0f953
1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents:
4040
diff
changeset
|
5712 int last; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5713 int coeff_count = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5714 |
| 2316 | 5715 int abslevel1 = 1; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5716 int abslevelgt1 = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5717 |
| 2898 | 5718 uint8_t *significant_coeff_ctx_base; |
| 5719 uint8_t *last_coeff_ctx_base; | |
| 5720 uint8_t *abs_level_m1_ctx_base; | |
| 2755 | 5721 |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5722 #ifndef ARCH_X86 |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5723 #define CABAC_ON_STACK |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5724 #endif |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5725 #ifdef CABAC_ON_STACK |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5726 #define CC &cc |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5727 CABACContext cc; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5728 cc.range = h->cabac.range; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5729 cc.low = h->cabac.low; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5730 cc.bytestream= h->cabac.bytestream; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5731 #else |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5732 #define CC &h->cabac |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5733 #endif |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5734 |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5735 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5736 /* cat: 0-> DC 16x16 n = 0 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5737 * 1-> AC 16x16 n = luma4x4idx |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5738 * 2-> Luma4x4 n = luma4x4idx |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5739 * 3-> DC Chroma n = iCbCr |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5740 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
| 2755 | 5741 * 5-> Luma8x8 n = 4 * luma8x8idx |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5742 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5743 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5744 /* read coded block flag */ |
| 2898 | 5745 if( cat != 5 ) { |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5746 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { |
| 2755 | 5747 if( cat == 1 || cat == 2 ) |
| 5748 h->non_zero_count_cache[scan8[n]] = 0; | |
| 5749 else if( cat == 4 ) | |
| 5750 h->non_zero_count_cache[scan8[16+n]] = 0; | |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5751 #ifdef CABAC_ON_STACK |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5752 h->cabac.range = cc.range ; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5753 h->cabac.low = cc.low ; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5754 h->cabac.bytestream= cc.bytestream; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5755 #endif |
| 2755 | 5756 return 0; |
| 5757 } | |
| 2898 | 5758 } |
| 5759 | |
| 5760 significant_coeff_ctx_base = h->cabac_state | |
| 3316 | 5761 + significant_coeff_flag_offset[MB_FIELD][cat]; |
| 2898 | 5762 last_coeff_ctx_base = h->cabac_state |
| 3316 | 5763 + last_coeff_flag_offset[MB_FIELD][cat]; |
| 2898 | 5764 abs_level_m1_ctx_base = h->cabac_state |
| 5765 + coeff_abs_level_m1_offset[cat]; | |
| 5766 | |
| 5767 if( cat == 5 ) { | |
| 5768 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \ | |
| 5769 for(last= 0; last < coefs; last++) { \ | |
| 5770 uint8_t *sig_ctx = significant_coeff_ctx_base + sig_off; \ | |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5771 if( get_cabac( CC, sig_ctx )) { \ |
| 2898 | 5772 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \ |
| 5773 index[coeff_count++] = last; \ | |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5774 if( get_cabac( CC, last_ctx ) ) { \ |
| 2898 | 5775 last= max_coeff; \ |
| 5776 break; \ | |
| 5777 } \ | |
| 5778 } \ | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4016
diff
changeset
|
5779 }\ |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4016
diff
changeset
|
5780 if( last == max_coeff -1 ) {\ |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4016
diff
changeset
|
5781 index[coeff_count++] = last;\ |
| 2898 | 5782 } |
| 4009 | 5783 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
5784 #if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) |
| 4051 | 5785 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); |
| 5786 } else { | |
| 5787 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); | |
| 5788 #else | |
| 3316 | 5789 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] ); |
| 2898 | 5790 } else { |
| 5791 DECODE_SIGNIFICANCE( max_coeff - 1, last, last ); | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4016
diff
changeset
|
5792 #endif |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5793 } |
| 2316 | 5794 assert(coeff_count > 0); |
| 5795 | |
| 5796 if( cat == 0 ) | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5797 h->cbp_table[mb_xy] |= 0x100; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5798 else if( cat == 1 || cat == 2 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5799 h->non_zero_count_cache[scan8[n]] = coeff_count; |
| 2316 | 5800 else if( cat == 3 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5801 h->cbp_table[mb_xy] |= 0x40 << n; |
| 2755 | 5802 else if( cat == 4 ) |
| 5803 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
| 2316 | 5804 else { |
| 2755 | 5805 assert( cat == 5 ); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
5806 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); |
| 2316 | 5807 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5808 |
|
4041
0113ceb0f953
1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents:
4040
diff
changeset
|
5809 for( coeff_count--; coeff_count >= 0; coeff_count-- ) { |
| 2898 | 5810 uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base; |
|
4041
0113ceb0f953
1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents:
4040
diff
changeset
|
5811 int j= scantable[index[coeff_count]]; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5812 |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5813 if( get_cabac( CC, ctx ) == 0 ) { |
| 2898 | 5814 if( !qmul ) { |
| 4040 | 5815 block[j] = get_cabac_bypass_sign( CC, -1); |
| 2316 | 5816 }else{ |
| 4040 | 5817 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;; |
| 2316 | 5818 } |
| 2967 | 5819 |
| 2313 | 5820 abslevel1++; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5821 } else { |
| 2313 | 5822 int coeff_abs = 2; |
| 2898 | 5823 ctx = 5 + FFMIN( 4, abslevelgt1 ) + abs_level_m1_ctx_base; |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5824 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) { |
| 2313 | 5825 coeff_abs++; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5826 } |
| 2313 | 5827 |
| 5828 if( coeff_abs >= 15 ) { | |
| 5829 int j = 0; | |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5830 while( get_cabac_bypass( CC ) ) { |
| 2313 | 5831 j++; |
| 5832 } | |
| 2967 | 5833 |
| 4016 | 5834 coeff_abs=1; |
| 2313 | 5835 while( j-- ) { |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5836 coeff_abs += coeff_abs + get_cabac_bypass( CC ); |
| 2313 | 5837 } |
| 4016 | 5838 coeff_abs+= 14; |
| 2313 | 5839 } |
| 5840 | |
| 2898 | 5841 if( !qmul ) { |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5842 if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs; |
| 2316 | 5843 else block[j] = coeff_abs; |
| 5844 }else{ | |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5845 if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6; |
| 2919 | 5846 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6; |
| 2316 | 5847 } |
| 2967 | 5848 |
| 2313 | 5849 abslevelgt1++; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5850 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5851 } |
|
4038
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5852 #ifdef CABAC_ON_STACK |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5853 h->cabac.range = cc.range ; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5854 h->cabac.low = cc.low ; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5855 h->cabac.bytestream= cc.bytestream; |
|
16697bdf4ac2
copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents:
4037
diff
changeset
|
5856 #endif |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5857 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5858 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5859 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
5860 static inline void compute_mb_neighbors(H264Context *h) |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5861 { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5862 MpegEncContext * const s = &h->s; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5863 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5864 h->top_mb_xy = mb_xy - s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5865 h->left_mb_xy[0] = mb_xy - 1; |
| 3316 | 5866 if(FRAME_MBAFF){ |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5867 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5868 const int top_pair_xy = pair_xy - s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5869 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5870 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
| 3316 | 5871 const int curr_mb_frame_flag = !MB_FIELD; |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5872 const int bottom = (s->mb_y & 1); |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5873 if (bottom |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5874 ? !curr_mb_frame_flag // bottom macroblock |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5875 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5876 ) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5877 h->top_mb_xy -= s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5878 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5879 if (left_mb_frame_flag != curr_mb_frame_flag) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5880 h->left_mb_xy[0] = pair_xy - 1; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5881 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5882 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5883 return; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5884 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5885 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5886 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5887 * decodes a macroblock |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5888 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5889 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5890 static int decode_mb_cabac(H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5891 MpegEncContext * const s = &h->s; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5892 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5893 int mb_type, partition_count, cbp = 0; |
| 2755 | 5894 int dct8x8_allowed= h->pps.transform_8x8_mode; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5895 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5896 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5897 |
| 4600 | 5898 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5899 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) { |
| 3316 | 5900 int skip; |
| 5901 /* a skipped mb needs the aff flag from the following mb */ | |
| 5902 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 ) | |
| 5903 predict_field_decoding_flag(h); | |
| 5904 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped ) | |
| 5905 skip = h->next_mb_skipped; | |
| 5906 else | |
| 5907 skip = decode_cabac_mb_skip( h, s->mb_x, s->mb_y ); | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5908 /* read skip flags */ |
| 3316 | 5909 if( skip ) { |
| 5910 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ | |
| 5911 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; | |
| 5912 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); | |
| 5913 if(h->next_mb_skipped) | |
| 5914 predict_field_decoding_flag(h); | |
| 5915 else | |
| 5916 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | |
| 5917 } | |
| 5918 | |
| 2396 | 5919 decode_mb_skip(h); |
| 5920 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5921 h->cbp_table[mb_xy] = 0; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5922 h->chroma_pred_mode_table[mb_xy] = 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5923 h->last_qscale_diff = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5924 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5925 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5926 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5927 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5928 } |
| 3316 | 5929 if(FRAME_MBAFF){ |
| 5930 if( (s->mb_y&1) == 0 ) | |
| 5931 h->mb_mbaff = | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5932 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5933 }else |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5934 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5935 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
5936 h->prev_mb_skipped = 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5937 |
| 3077 | 5938 compute_mb_neighbors(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5939 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5940 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5941 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5942 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5943 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5944 if( h->slice_type == B_TYPE ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5945 if( mb_type < 23 ){ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5946 partition_count= b_mb_type_info[mb_type].partition_count; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5947 mb_type= b_mb_type_info[mb_type].type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5948 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5949 mb_type -= 23; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5950 goto decode_intra_mb; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5951 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5952 } else if( h->slice_type == P_TYPE ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5953 if( mb_type < 5) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5954 partition_count= p_mb_type_info[mb_type].partition_count; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5955 mb_type= p_mb_type_info[mb_type].type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5956 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5957 mb_type -= 5; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5958 goto decode_intra_mb; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5959 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5960 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5961 assert(h->slice_type == I_TYPE); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5962 decode_intra_mb: |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5963 partition_count = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5964 cbp= i_mb_type_info[mb_type].cbp; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5965 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5966 mb_type= i_mb_type_info[mb_type].type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5967 } |
| 3316 | 5968 if(MB_FIELD) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5969 mb_type |= MB_TYPE_INTERLACED; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5970 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5971 h->slice_table[ mb_xy ]= h->slice_num; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5972 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5973 if(IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5974 const uint8_t *ptr; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5975 unsigned int x, y; |
| 2967 | 5976 |
| 5127 | 5977 // We assume these blocks are very rare so we do not optimize it. |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5978 // FIXME The two following lines get the bitstream position in the cabac |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5979 // decode, I think it should be done by a function in cabac.h (or cabac.c). |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5980 ptr= h->cabac.bytestream; |
| 4344 | 5981 if(h->cabac.low&0x1) ptr--; |
| 5982 if(CABAC_BITS==16){ | |
| 5983 if(h->cabac.low&0x1FF) ptr--; | |
| 5984 } | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5985 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5986 // The pixels are stored in the same order as levels in h->mb array. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5987 for(y=0; y<16; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5988 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5989 for(x=0; x<16; x++){ |
| 4600 | 5990 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", *ptr); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5991 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5992 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5993 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5994 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5995 const int index= 256 + 4*(y&3) + 32*(y>>2); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5996 for(x=0; x<8; x++){ |
| 4600 | 5997 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", *ptr); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5998 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5999 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6000 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6001 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6002 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6003 for(x=0; x<8; x++){ |
| 4600 | 6004 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", *ptr); |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6005 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6006 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6007 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6008 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6009 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6010 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6011 // All blocks are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6012 h->cbp_table[mb_xy] = 0x1ef; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
6013 h->chroma_pred_mode_table[mb_xy] = 0; |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6014 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6015 s->current_picture.qscale_table[mb_xy]= 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6016 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6017 // All coeffs are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6018 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2755 | 6019 s->current_picture.mb_type[mb_xy]= mb_type; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6020 return 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6021 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6022 |
| 3316 | 6023 if(MB_MBAFF){ |
| 6024 h->ref_count[0] <<= 1; | |
| 6025 h->ref_count[1] <<= 1; | |
| 6026 } | |
| 6027 | |
| 2449 | 6028 fill_caches(h, mb_type, 0); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6029 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6030 if( IS_INTRA( mb_type ) ) { |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6031 int i, pred_mode; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6032 if( IS_INTRA4x4( mb_type ) ) { |
| 2755 | 6033 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
| 6034 mb_type |= MB_TYPE_8x8DCT; | |
| 6035 for( i = 0; i < 16; i+=4 ) { | |
| 6036 int pred = pred_intra_mode( h, i ); | |
| 6037 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
| 6038 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 6039 } | |
| 6040 } else { | |
| 6041 for( i = 0; i < 16; i++ ) { | |
| 6042 int pred = pred_intra_mode( h, i ); | |
| 6043 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6044 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6045 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
| 2755 | 6046 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6047 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6048 write_back_intra_pred_mode(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6049 if( check_intra4x4_pred_mode(h) < 0 ) return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6050 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6051 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6052 if( h->intra16x16_pred_mode < 0 ) return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6053 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6054 h->chroma_pred_mode_table[mb_xy] = |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6055 pred_mode = decode_cabac_mb_chroma_pre_mode( h ); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6056 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6057 pred_mode= check_intra_pred_mode( h, pred_mode ); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6058 if( pred_mode < 0 ) return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6059 h->chroma_pred_mode= pred_mode; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6060 } else if( partition_count == 4 ) { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6061 int i, j, sub_partition_count[4], list, ref[2][4]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6062 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6063 if( h->slice_type == B_TYPE ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6064 for( i = 0; i < 4; i++ ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6065 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h ); |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6066 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6067 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6068 } |
| 3482 | 6069 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] | |
| 6070 h->sub_mb_type[2] | h->sub_mb_type[3]) ) { | |
| 2396 | 6071 pred_direct_motion(h, &mb_type); |
| 6072 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
| 6073 for( i = 0; i < 4; i++ ) | |
| 6074 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
| 6075 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
| 6076 } | |
| 6077 } | |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6078 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6079 for( i = 0; i < 4; i++ ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6080 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h ); |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6081 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6082 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6083 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6084 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6085 |
| 4533 | 6086 for( list = 0; list < h->list_count; list++ ) { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6087 for( i = 0; i < 4; i++ ) { |
| 2396 | 6088 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 6089 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6090 if( h->ref_count[list] > 1 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6091 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6092 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6093 ref[list][i] = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6094 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6095 ref[list][i] = -1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6096 } |
| 2110 | 6097 h->ref_cache[list][ scan8[4*i]+1 ]= |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6098 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6099 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6100 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6101 |
| 2755 | 6102 if(dct8x8_allowed) |
| 6103 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 6104 | |
| 4533 | 6105 for(list=0; list<h->list_count; list++){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6106 for(i=0; i<4; i++){ |
| 2396 | 6107 if(IS_DIRECT(h->sub_mb_type[i])){ |
| 6108 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
| 6109 continue; | |
| 6110 } | |
| 2110 | 6111 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]; |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6112 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6113 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6114 const int sub_mb_type= h->sub_mb_type[i]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6115 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6116 for(j=0; j<sub_partition_count[i]; j++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6117 int mpx, mpy; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6118 int mx, my; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6119 const int index= 4*i + block_width*j; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6120 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6121 int16_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6122 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mpx, &mpy); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6123 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6124 mx = mpx + decode_cabac_mb_mvd( h, list, index, 0 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6125 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 ); |
| 4600 | 6126 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6127 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6128 if(IS_SUB_8X8(sub_mb_type)){ |
| 4530 | 6129 mv_cache[ 1 ][0]= |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6130 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
| 4530 | 6131 mv_cache[ 1 ][1]= |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6132 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6133 |
| 4530 | 6134 mvd_cache[ 1 ][0]= |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6135 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx; |
| 4530 | 6136 mvd_cache[ 1 ][1]= |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6137 mvd_cache[ 8 ][1]= mvd_cache[ 9 ][1]= my - mpy; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6138 }else if(IS_SUB_8X4(sub_mb_type)){ |
| 4530 | 6139 mv_cache[ 1 ][0]= mx; |
| 6140 mv_cache[ 1 ][1]= my; | |
| 6141 | |
| 6142 mvd_cache[ 1 ][0]= mx - mpx; | |
| 6143 mvd_cache[ 1 ][1]= my - mpy; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6144 }else if(IS_SUB_4X8(sub_mb_type)){ |
| 4530 | 6145 mv_cache[ 8 ][0]= mx; |
| 6146 mv_cache[ 8 ][1]= my; | |
| 6147 | |
| 6148 mvd_cache[ 8 ][0]= mx - mpx; | |
| 6149 mvd_cache[ 8 ][1]= my - mpy; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6150 } |
| 4530 | 6151 mv_cache[ 0 ][0]= mx; |
| 6152 mv_cache[ 0 ][1]= my; | |
| 6153 | |
| 6154 mvd_cache[ 0 ][0]= mx - mpx; | |
| 6155 mvd_cache[ 0 ][1]= my - mpy; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6156 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6157 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6158 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6159 uint32_t *pd= (uint32_t *)&h->mvd_cache[list][ scan8[4*i] ][0]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6160 p[0] = p[1] = p[8] = p[9] = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6161 pd[0]= pd[1]= pd[8]= pd[9]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6162 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6163 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6164 } |
| 2396 | 6165 } else if( IS_DIRECT(mb_type) ) { |
| 6166 pred_direct_motion(h, &mb_type); | |
| 6167 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 6168 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 2755 | 6169 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 6170 } else { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6171 int list, mx, my, i, mpx, mpy; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6172 if(IS_16X16(mb_type)){ |
| 4534 | 6173 for(list=0; list<h->list_count; list++){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6174 if(IS_DIR(mb_type, 0, list)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6175 const int ref = h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 0 ) : 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6176 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); |
| 2523 | 6177 }else |
| 4534 | 6178 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); //FIXME factorize and the other fill_rect below too |
| 6179 } | |
| 6180 for(list=0; list<h->list_count; list++){ | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6181 if(IS_DIR(mb_type, 0, list)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6182 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mpx, &mpy); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6183 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6184 mx = mpx + decode_cabac_mb_mvd( h, list, 0, 0 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6185 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 ); |
| 4600 | 6186 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6187 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6188 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx-mpx,my-mpy), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6189 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 6190 }else |
| 6191 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6192 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6193 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6194 else if(IS_16X8(mb_type)){ |
| 4533 | 6195 for(list=0; list<h->list_count; list++){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6196 for(i=0; i<2; i++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6197 if(IS_DIR(mb_type, i, list)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6198 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 8*i ) : 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6199 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
| 2396 | 6200 }else |
| 6201 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6202 } |
| 4533 | 6203 } |
| 6204 for(list=0; list<h->list_count; list++){ | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6205 for(i=0; i<2; i++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6206 if(IS_DIR(mb_type, i, list)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6207 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mpx, &mpy); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6208 mx = mpx + decode_cabac_mb_mvd( h, list, 8*i, 0 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6209 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 ); |
| 4600 | 6210 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6211 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6212 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx-mpx,my-mpy), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6213 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2523 | 6214 }else{ |
| 2396 | 6215 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
| 6216 fill_rectangle(h-> mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6217 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6218 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6219 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6220 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6221 assert(IS_8X16(mb_type)); |
| 4533 | 6222 for(list=0; list<h->list_count; list++){ |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6223 for(i=0; i<2; i++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6224 if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6225 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 4*i ) : 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6226 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
| 2396 | 6227 }else |
| 6228 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6229 } |
| 4533 | 6230 } |
| 6231 for(list=0; list<h->list_count; list++){ | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6232 for(i=0; i<2; i++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6233 if(IS_DIR(mb_type, i, list)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6234 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mpx, &mpy); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6235 mx = mpx + decode_cabac_mb_mvd( h, list, 4*i, 0 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6236 my = mpy + decode_cabac_mb_mvd( h, list, 4*i, 1 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6237 |
| 4600 | 6238 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6239 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx-mpx,my-mpy), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6240 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 6241 }else{ |
| 2396 | 6242 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
| 6243 fill_rectangle(h-> mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6244 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6245 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6246 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6247 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6248 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6249 |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
6250 if( IS_INTER( mb_type ) ) { |
|
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
6251 h->chroma_pred_mode_table[mb_xy] = 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6252 write_back_motion( h, mb_type ); |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
6253 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6254 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6255 if( !IS_INTRA16x16( mb_type ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6256 cbp = decode_cabac_mb_cbp_luma( h ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6257 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6258 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6259 |
| 3651 | 6260 h->cbp_table[mb_xy] = h->cbp = cbp; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6261 |
| 2755 | 6262 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
| 6263 if( decode_cabac_mb_transform_size( h ) ) | |
| 6264 mb_type |= MB_TYPE_8x8DCT; | |
| 6265 } | |
| 6266 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 6267 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6268 if( cbp || IS_INTRA16x16( mb_type ) ) { |
| 3174 | 6269 const uint8_t *scan, *scan8x8, *dc_scan; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6270 int dqp; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6271 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6272 if(IS_INTERLACED(mb_type)){ |
| 3316 | 6273 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; |
| 2763 | 6274 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6275 dc_scan= luma_dc_field_scan; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6276 }else{ |
| 3316 | 6277 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; |
| 2763 | 6278 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6279 dc_scan= luma_dc_zigzag_scan; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6280 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6281 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6282 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h ); |
|
2883
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6283 if( dqp == INT_MIN ){ |
|
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6284 av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y); |
|
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6285 return -1; |
|
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6286 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6287 s->qscale += dqp; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6288 if(((unsigned)s->qscale) > 51){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6289 if(s->qscale<0) s->qscale+= 52; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6290 else s->qscale-= 52; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6291 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6292 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6293 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6294 if( IS_INTRA16x16( mb_type ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6295 int i; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6296 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
| 2898 | 6297 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6298 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6299 if( cbp&15 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6300 for( i = 0; i < 16; i++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6301 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
| 2919 | 6302 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6303 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6304 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6305 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6306 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6307 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6308 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6309 int i8x8, i4x4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6310 for( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6311 if( cbp & (1<<i8x8) ) { |
| 2755 | 6312 if( IS_8x8DCT(mb_type) ) { |
| 6313 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, | |
| 3174 | 6314 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64) < 0 ) |
| 2755 | 6315 return -1; |
| 6316 } else | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6317 for( i4x4 = 0; i4x4 < 4; i4x4++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6318 const int index = 4*i8x8 + i4x4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6319 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
|
3972
f5f1c9af095d
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents:
3955
diff
changeset
|
6320 //START_TIMER |
| 2919 | 6321 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) < 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6322 return -1; |
|
3972
f5f1c9af095d
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents:
3955
diff
changeset
|
6323 //STOP_TIMER("decode_residual") |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6324 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6325 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6326 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6327 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6328 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6329 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6330 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6331 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6332 if( cbp&0x30 ){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6333 int c; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6334 for( c = 0; c < 2; c++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6335 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
| 2898 | 6336 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6337 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6338 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6339 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6340 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6341 if( cbp&0x20 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6342 int c, i; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6343 for( c = 0; c < 2; c++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6344 for( i = 0; i < 4; i++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6345 const int index = 16 + 4 * c + i; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6346 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
| 2919 | 6347 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp], 15) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6348 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6349 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6350 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6351 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6352 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6353 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6354 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6355 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6356 } else { |
| 2315 | 6357 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
| 6358 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
| 6359 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 6360 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 3316 | 6361 h->last_qscale_diff = 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6362 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6363 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6364 s->current_picture.qscale_table[mb_xy]= s->qscale; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6365 write_back_non_zero_count(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6366 |
| 3316 | 6367 if(MB_MBAFF){ |
| 6368 h->ref_count[0] >>= 1; | |
| 6369 h->ref_count[1] >>= 1; | |
| 6370 } | |
| 6371 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6372 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6373 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6374 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6375 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6376 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6377 int i, d; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6378 const int index_a = qp + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6379 const int alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6380 const int beta = (beta_table+52)[qp + h->slice_beta_offset]; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6381 |
| 2633 | 6382 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6383 int8_t tc[4]; |
| 2633 | 6384 for(i=0; i<4; i++) |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6385 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
| 2633 | 6386 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); |
| 6387 } else { | |
| 6388 /* 16px edge length, because bS=4 is triggered by being at | |
| 6389 * the edge of an intra MB, so all 4 bS are the same */ | |
| 6390 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6391 const int p0 = pix[-1]; |
| 6392 const int p1 = pix[-2]; | |
| 6393 const int p2 = pix[-3]; | |
| 6394 | |
| 6395 const int q0 = pix[0]; | |
| 6396 const int q1 = pix[1]; | |
| 6397 const int q2 = pix[2]; | |
| 6398 | |
| 4001 | 6399 if( FFABS( p0 - q0 ) < alpha && |
| 6400 FFABS( p1 - p0 ) < beta && | |
| 6401 FFABS( q1 - q0 ) < beta ) { | |
| 6402 | |
| 6403 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6404 if( FFABS( p2 - p0 ) < beta) | |
| 1898 | 6405 { |
| 6406 const int p3 = pix[-4]; | |
| 6407 /* p0', p1', p2' */ | |
| 6408 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6409 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6410 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6411 } else { | |
| 6412 /* p0' */ | |
| 6413 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6414 } | |
| 4001 | 6415 if( FFABS( q2 - q0 ) < beta) |
| 1898 | 6416 { |
| 6417 const int q3 = pix[3]; | |
| 6418 /* q0', q1', q2' */ | |
| 6419 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6420 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6421 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6422 } else { | |
| 6423 /* q0' */ | |
| 6424 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6425 } | |
| 6426 }else{ | |
| 6427 /* p0', q0' */ | |
| 6428 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6429 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6430 } | |
| 4600 | 6431 tprintf(h->s.avctx, "filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6432 } |
| 1898 | 6433 pix += stride; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6434 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6435 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6436 } |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6437 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
| 2834 | 6438 int i; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6439 const int index_a = qp + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6440 const int alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6441 const int beta = (beta_table+52)[qp + h->slice_beta_offset]; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6442 |
| 2633 | 6443 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6444 int8_t tc[4]; |
| 2633 | 6445 for(i=0; i<4; i++) |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6446 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
| 2633 | 6447 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); |
| 6448 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6449 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6450 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6451 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6452 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6453 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6454 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6455 for( i = 0; i < 16; i++, pix += stride) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6456 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6457 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6458 int beta; |
| 2967 | 6459 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6460 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6461 int bS_index = (i >> 1); |
| 3316 | 6462 if (!MB_FIELD) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6463 bS_index &= ~1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6464 bS_index |= (i & 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6465 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6466 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6467 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6468 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6469 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6470 |
| 3316 | 6471 qp_index = MB_FIELD ? (i >> 3) : (i & 1); |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6472 index_a = qp[qp_index] + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6473 alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6474 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6475 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6476 if( bS[bS_index] < 4 ) { |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6477 const int tc0 = (tc0_table+52)[index_a][bS[bS_index] - 1]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6478 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6479 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6480 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6481 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6482 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6483 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6484 |
| 4001 | 6485 if( FFABS( p0 - q0 ) < alpha && |
| 6486 FFABS( p1 - p0 ) < beta && | |
| 6487 FFABS( q1 - q0 ) < beta ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6488 int tc = tc0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6489 int i_delta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6490 |
| 4001 | 6491 if( FFABS( p2 - p0 ) < beta ) { |
| 4594 | 6492 pix[-2] = p1 + av_clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6493 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6494 } |
| 4001 | 6495 if( FFABS( q2 - q0 ) < beta ) { |
| 4594 | 6496 pix[1] = q1 + av_clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6497 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6498 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6499 |
| 4594 | 6500 i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
| 6501 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
| 6502 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
| 4600 | 6503 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6504 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6505 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6506 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6507 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6508 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6509 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6510 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6511 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6512 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6513 |
| 4001 | 6514 if( FFABS( p0 - q0 ) < alpha && |
| 6515 FFABS( p1 - p0 ) < beta && | |
| 6516 FFABS( q1 - q0 ) < beta ) { | |
| 6517 | |
| 6518 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6519 if( FFABS( p2 - p0 ) < beta) | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6520 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6521 const int p3 = pix[-4]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6522 /* p0', p1', p2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6523 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6524 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6525 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6526 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6527 /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6528 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6529 } |
| 4001 | 6530 if( FFABS( q2 - q0 ) < beta) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6531 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6532 const int q3 = pix[3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6533 /* q0', q1', q2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6534 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6535 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6536 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6537 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6538 /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6539 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6540 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6541 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6542 /* p0', q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6543 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6544 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6545 } |
| 4600 | 6546 tprintf(h->s.avctx, "filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6547 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6548 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6549 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6550 } |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6551 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6552 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6553 for( i = 0; i < 8; i++, pix += stride) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6554 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6555 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6556 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6557 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6558 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6559 int bS_index = i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6560 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6561 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6562 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6563 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6564 |
| 3316 | 6565 qp_index = MB_FIELD ? (i >> 2) : (i & 1); |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6566 index_a = qp[qp_index] + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6567 alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6568 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset]; |
| 3316 | 6569 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6570 if( bS[bS_index] < 4 ) { |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6571 const int tc = (tc0_table+52)[index_a][bS[bS_index] - 1] + 1; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6572 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6573 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6574 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6575 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6576 |
| 4001 | 6577 if( FFABS( p0 - q0 ) < alpha && |
| 6578 FFABS( p1 - p0 ) < beta && | |
| 6579 FFABS( q1 - q0 ) < beta ) { | |
| 4594 | 6580 const int i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
| 6581 | |
| 6582 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
| 6583 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
| 4600 | 6584 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6585 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6586 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6587 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6588 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6589 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6590 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6591 |
| 4001 | 6592 if( FFABS( p0 - q0 ) < alpha && |
| 6593 FFABS( p1 - p0 ) < beta && | |
| 6594 FFABS( q1 - q0 ) < beta ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6595 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6596 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6597 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ |
| 4600 | 6598 tprintf(h->s.avctx, "filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6599 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6600 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6601 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6602 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6603 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6604 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6605 int i, d; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6606 const int index_a = qp + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6607 const int alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6608 const int beta = (beta_table+52)[qp + h->slice_beta_offset]; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6609 const int pix_next = stride; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6610 |
| 2633 | 6611 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6612 int8_t tc[4]; |
| 2633 | 6613 for(i=0; i<4; i++) |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6614 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
| 2633 | 6615 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); |
| 6616 } else { | |
| 6617 /* 16px edge length, see filter_mb_edgev */ | |
| 6618 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6619 const int p0 = pix[-1*pix_next]; |
| 6620 const int p1 = pix[-2*pix_next]; | |
| 6621 const int p2 = pix[-3*pix_next]; | |
| 6622 const int q0 = pix[0]; | |
| 6623 const int q1 = pix[1*pix_next]; | |
| 6624 const int q2 = pix[2*pix_next]; | |
| 6625 | |
| 4001 | 6626 if( FFABS( p0 - q0 ) < alpha && |
| 6627 FFABS( p1 - p0 ) < beta && | |
| 6628 FFABS( q1 - q0 ) < beta ) { | |
| 1898 | 6629 |
| 6630 const int p3 = pix[-4*pix_next]; | |
| 6631 const int q3 = pix[ 3*pix_next]; | |
| 6632 | |
| 4001 | 6633 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ |
| 6634 if( FFABS( p2 - p0 ) < beta) { | |
| 1898 | 6635 /* p0', p1', p2' */ |
| 6636 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6637 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6638 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6639 } else { | |
| 6640 /* p0' */ | |
| 6641 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6642 } | |
| 4001 | 6643 if( FFABS( q2 - q0 ) < beta) { |
| 1898 | 6644 /* q0', q1', q2' */ |
| 6645 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6646 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6647 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6648 } else { | |
| 6649 /* q0' */ | |
| 6650 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6651 } | |
| 6652 }else{ | |
| 6653 /* p0', q0' */ | |
| 6654 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6655 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6656 } | |
| 4600 | 6657 tprintf(h->s.avctx, "filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6658 } |
| 1898 | 6659 pix++; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6660 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6661 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6662 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6663 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6664 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
| 2834 | 6665 int i; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6666 const int index_a = qp + h->slice_alpha_c0_offset; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6667 const int alpha = (alpha_table+52)[index_a]; |
|
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6668 const int beta = (beta_table+52)[qp + h->slice_beta_offset]; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6669 |
| 2633 | 6670 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6671 int8_t tc[4]; |
| 2633 | 6672 for(i=0; i<4; i++) |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6673 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
| 2633 | 6674 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); |
| 6675 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6676 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6677 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6678 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6679 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6680 static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6681 MpegEncContext * const s = &h->s; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6682 int mb_xy, mb_type; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6683 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6684 |
|
5093
f0ffa056b77c
filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents:
5083
diff
changeset
|
6685 mb_xy = mb_x + mb_y*s->mb_stride; |
|
f0ffa056b77c
filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents:
5083
diff
changeset
|
6686 |
|
f0ffa056b77c
filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents:
5083
diff
changeset
|
6687 if(mb_x==0 || mb_y==0 || !s->dsp.h264_loop_filter_strength || |
|
f0ffa056b77c
filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents:
5083
diff
changeset
|
6688 (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] || |
|
f0ffa056b77c
filter_mb_fast() doesn't handle h->deblocking_filter==2 (skip slice edges), so delegate that case to filter_mb().
lorenm
parents:
5083
diff
changeset
|
6689 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) { |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6690 filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6691 return; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6692 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6693 assert(!FRAME_MBAFF); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6694 |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6695 mb_type = s->current_picture.mb_type[mb_xy]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6696 qp = s->current_picture.qscale_table[mb_xy]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6697 qp0 = s->current_picture.qscale_table[mb_xy-1]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6698 qp1 = s->current_picture.qscale_table[h->top_mb_xy]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6699 qpc = get_chroma_qp( h->pps.chroma_qp_index_offset, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6700 qpc0 = get_chroma_qp( h->pps.chroma_qp_index_offset, qp0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6701 qpc1 = get_chroma_qp( h->pps.chroma_qp_index_offset, qp1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6702 qp0 = (qp + qp0 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6703 qp1 = (qp + qp1 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6704 qpc0 = (qpc + qpc0 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6705 qpc1 = (qpc + qpc1 + 1) >> 1; |
| 3651 | 6706 qp_thresh = 15 - h->slice_alpha_c0_offset; |
| 6707 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh && | |
| 6708 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh) | |
| 6709 return; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6710 |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6711 if( IS_INTRA(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6712 int16_t bS4[4] = {4,4,4,4}; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6713 int16_t bS3[4] = {3,3,3,3}; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6714 if( IS_8x8DCT(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6715 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6716 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6717 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6718 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6719 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6720 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6721 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6722 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6723 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6724 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6725 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6726 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6727 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6728 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6729 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6730 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6731 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6732 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6733 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bS4, qpc1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6734 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6735 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bS4, qpc1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6736 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6737 return; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6738 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6739 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6740 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS; |
| 3651 | 6741 int edges; |
| 6742 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) { | |
| 6743 edges = 4; | |
| 6744 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL; | |
| 6745 } else { | |
| 6746 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : | |
| 6747 (mb_type & MB_TYPE_16x8) ? 1 : 0; | |
| 6748 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
| 6749 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
| 6750 ? 3 : 0; | |
| 6751 int step = IS_8x8DCT(mb_type) ? 2 : 1; | |
| 6752 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; | |
| 6753 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache, | |
| 6754 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 ); | |
| 6755 } | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6756 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) ) |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6757 bSv[0][0] = 0x0004000400040004ULL; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6758 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) ) |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6759 bSv[1][0] = 0x0004000400040004ULL; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6760 |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6761 #define FILTER(hv,dir,edge)\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6762 if(bSv[dir][edge]) {\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6763 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6764 if(!(edge&1)) {\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6765 filter_mb_edgec##hv( h, &img_cb[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6766 filter_mb_edgec##hv( h, &img_cr[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6767 }\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6768 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6769 if( edges == 1 ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6770 FILTER(v,0,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6771 FILTER(h,1,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6772 } else if( IS_8x8DCT(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6773 FILTER(v,0,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6774 FILTER(v,0,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6775 FILTER(h,1,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6776 FILTER(h,1,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6777 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6778 FILTER(v,0,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6779 FILTER(v,0,1); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6780 FILTER(v,0,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6781 FILTER(v,0,3); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6782 FILTER(h,1,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6783 FILTER(h,1,1); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6784 FILTER(h,1,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6785 FILTER(h,1,3); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6786 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6787 #undef FILTER |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6788 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6789 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6790 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6791 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6792 MpegEncContext * const s = &h->s; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6793 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 3316 | 6794 const int mb_type = s->current_picture.mb_type[mb_xy]; |
| 6795 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4; | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6796 int first_vertical_edge_done = 0; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6797 int dir; |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6798 /* FIXME: A given frame may occupy more than one position in |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6799 * the reference list. So ref2frm should be populated with |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6800 * frame numbers, not indices. */ |
| 3316 | 6801 static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, |
| 6802 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31}; | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6803 |
| 3101 | 6804 //for sufficiently low qp, filtering wouldn't do anything |
| 6805 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp | |
| 3316 | 6806 if(!FRAME_MBAFF){ |
| 3101 | 6807 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, h->pps.chroma_qp_index_offset); |
| 6808 int qp = s->current_picture.qscale_table[mb_xy]; | |
| 6809 if(qp <= qp_thresh | |
| 6810 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh) | |
| 6811 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){ | |
| 6812 return; | |
| 6813 } | |
| 6814 } | |
| 6815 | |
| 3316 | 6816 if (FRAME_MBAFF |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6817 // left mb is in picture |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6818 && h->slice_table[mb_xy-1] != 255 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6819 // and current and left pair do not have the same interlaced type |
| 3316 | 6820 && (IS_INTERLACED(mb_type) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1])) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6821 // and left mb is in the same slice if deblocking_filter == 2 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6822 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6823 /* First vertical edge is different in MBAFF frames |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6824 * There are 8 different bS to compute and 2 different Qp |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6825 */ |
| 3316 | 6826 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride; |
| 6827 const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride }; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6828 int16_t bS[8]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6829 int qp[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6830 int chroma_qp[2]; |
| 3316 | 6831 int mb_qp, mbn0_qp, mbn1_qp; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6832 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6833 first_vertical_edge_done = 1; |
| 3316 | 6834 |
| 6835 if( IS_INTRA(mb_type) ) | |
| 6836 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4; | |
| 6837 else { | |
| 6838 for( i = 0; i < 8; i++ ) { | |
| 6839 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1]; | |
| 6840 | |
| 6841 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) | |
| 6842 bS[i] = 4; | |
| 6843 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || | |
| 6844 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ | |
| 6845 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) | |
| 6846 bS[i] = 2; | |
| 6847 else | |
| 6848 bS[i] = 1; | |
| 6849 } | |
| 6850 } | |
| 6851 | |
| 6852 mb_qp = s->current_picture.qscale_table[mb_xy]; | |
| 6853 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]]; | |
| 6854 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]]; | |
| 6855 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1; | |
| 6856 chroma_qp[0] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) + | |
| 6857 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn0_qp ) + 1 ) >> 1; | |
| 6858 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1; | |
| 6859 chroma_qp[1] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) + | |
| 6860 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn1_qp ) + 1 ) >> 1; | |
| 6861 | |
| 6862 /* Filter edge */ | |
| 4600 | 6863 tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPc:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], chroma_qp[0], chroma_qp[1], linesize, uvlinesize); |
| 6864 { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } | |
| 3316 | 6865 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp ); |
| 6866 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, chroma_qp ); | |
| 6867 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, chroma_qp ); | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6868 } |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6869 /* dir : 0 -> vertical edge, 1 -> horizontal edge */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6870 for( dir = 0; dir < 2; dir++ ) |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6871 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6872 int edge; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6873 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
| 2924 | 6874 const int mbm_type = s->current_picture.mb_type[mbm_xy]; |
| 2454 | 6875 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
| 6876 | |
| 3101 | 6877 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP)) |
| 6878 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4; | |
| 2926 | 6879 // how often to recheck mv-based bS when iterating between edges |
| 6880 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 : | |
| 6881 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0; | |
| 6882 // how often to recheck mv-based bS when iterating along each edge | |
| 6883 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); | |
| 6884 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6885 if (first_vertical_edge_done) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6886 start = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6887 first_vertical_edge_done = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6888 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6889 |
| 2454 | 6890 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy]) |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6891 start = 1; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6892 |
| 3316 | 6893 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0 |
| 6894 && !IS_INTERLACED(mb_type) | |
| 6895 && IS_INTERLACED(mbm_type) | |
| 6896 ) { | |
| 6897 // This is a special case in the norm where the filtering must | |
| 6898 // be done twice (one each of the field) even if we are in a | |
| 6899 // frame macroblock. | |
| 6900 // | |
| 6901 static const int nnz_idx[4] = {4,5,6,3}; | |
| 6902 unsigned int tmp_linesize = 2 * linesize; | |
| 6903 unsigned int tmp_uvlinesize = 2 * uvlinesize; | |
| 6904 int mbn_xy = mb_xy - 2 * s->mb_stride; | |
| 6905 int qp, chroma_qp; | |
| 6906 int i, j; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6907 int16_t bS[4]; |
| 3316 | 6908 |
| 6909 for(j=0; j<2; j++, mbn_xy += s->mb_stride){ | |
| 6910 if( IS_INTRA(mb_type) || | |
| 6911 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) { | |
| 6912 bS[0] = bS[1] = bS[2] = bS[3] = 3; | |
| 6913 } else { | |
| 6914 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy]; | |
| 6915 for( i = 0; i < 4; i++ ) { | |
| 6916 if( h->non_zero_count_cache[scan8[0]+i] != 0 || | |
| 6917 mbn_nnz[nnz_idx[i]] != 0 ) | |
| 6918 bS[i] = 2; | |
| 6919 else | |
| 6920 bS[i] = 1; | |
| 6921 } | |
| 6922 } | |
| 6923 // Do not use s->qscale as luma quantizer because it has not the same | |
| 6924 // value in IPCM macroblocks. | |
| 6925 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; | |
| 4600 | 6926 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize); |
| 6927 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } | |
| 3316 | 6928 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp ); |
| 6929 chroma_qp = ( h->chroma_qp + | |
| 6930 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; | |
| 6931 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp ); | |
| 6932 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp ); | |
| 6933 } | |
| 6934 | |
| 6935 start = 1; | |
| 6936 } | |
| 6937 | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6938 /* Calculate bS */ |
| 2924 | 6939 for( edge = start; edge < edges; edge++ ) { |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6940 /* mbn_xy: neighbor macroblock */ |
| 2924 | 6941 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
| 6942 const int mbn_type = s->current_picture.mb_type[mbn_xy]; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6943 int16_t bS[4]; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6944 int qp; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6945 |
| 2924 | 6946 if( (edge&1) && IS_8x8DCT(mb_type) ) |
| 2755 | 6947 continue; |
| 6948 | |
| 2924 | 6949 if( IS_INTRA(mb_type) || |
| 6950 IS_INTRA(mbn_type) ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6951 int value; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6952 if (edge == 0) { |
| 2924 | 6953 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type)) |
| 3316 | 6954 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0)) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6955 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6956 value = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6957 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6958 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6959 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6960 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6961 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6962 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6963 bS[0] = bS[1] = bS[2] = bS[3] = value; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6964 } else { |
| 2924 | 6965 int i, l; |
| 6966 int mv_done; | |
| 6967 | |
| 6968 if( edge & mask_edge ) { | |
| 6969 bS[0] = bS[1] = bS[2] = bS[3] = 0; | |
| 6970 mv_done = 1; | |
| 6971 } | |
| 3316 | 6972 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) { |
| 6973 bS[0] = bS[1] = bS[2] = bS[3] = 1; | |
| 6974 mv_done = 1; | |
| 6975 } | |
| 2924 | 6976 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) { |
| 6977 int b_idx= 8 + 4 + edge * (dir ? 8:1); | |
| 6978 int bn_idx= b_idx - (dir ? 8:1); | |
| 6979 int v = 0; | |
| 6980 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
| 6981 v |= ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || | |
| 4001 | 6982 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 6983 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit; | |
| 2924 | 6984 } |
| 6985 bS[0] = bS[1] = bS[2] = bS[3] = v; | |
| 6986 mv_done = 1; | |
| 6987 } | |
| 6988 else | |
| 6989 mv_done = 0; | |
| 6990 | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6991 for( i = 0; i < 4; i++ ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6992 int x = dir == 0 ? edge : i; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6993 int y = dir == 0 ? i : edge; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6994 int b_idx= 8 + 4 + x + 8*y; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6995 int bn_idx= b_idx - (dir ? 8:1); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6996 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6997 if( h->non_zero_count_cache[b_idx] != 0 || |
| 2449 | 6998 h->non_zero_count_cache[bn_idx] != 0 ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6999 bS[i] = 2; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7000 } |
| 2924 | 7001 else if(!mv_done) |
| 2523 | 7002 { |
| 7003 bS[i] = 0; | |
| 7004 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
7005 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
| 4001 | 7006 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 7007 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) { | |
| 2523 | 7008 bS[i] = 1; |
| 7009 break; | |
| 7010 } | |
| 7011 } | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7012 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7013 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7014 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7015 if(bS[0]+bS[1]+bS[2]+bS[3] == 0) |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7016 continue; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7017 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7018 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7019 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7020 // Do not use s->qscale as luma quantizer because it has not the same |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
7021 // value in IPCM macroblocks. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
7022 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
| 4600 | 7023 //tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]); |
| 7024 tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize); | |
| 7025 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7026 if( dir == 0 ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7027 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 7028 if( (edge&1) == 0 ) { |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7029 int chroma_qp = ( h->chroma_qp + |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7030 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7031 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS, chroma_qp ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7032 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS, chroma_qp ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7033 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7034 } else { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7035 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 7036 if( (edge&1) == 0 ) { |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7037 int chroma_qp = ( h->chroma_qp + |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7038 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7039 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS, chroma_qp ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7040 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS, chroma_qp ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7041 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7042 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7043 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7044 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7045 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7046 |
| 1168 | 7047 static int decode_slice(H264Context *h){ |
| 7048 MpegEncContext * const s = &h->s; | |
| 7049 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 7050 | |
| 7051 s->mb_skip_run= -1; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7052 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7053 if( h->pps.cabac ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7054 int i; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7055 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7056 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7057 align_get_bits( &s->gb ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7058 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7059 /* init cabac */ |
|
3993
8b7c59b7af01
make state transition tables global as they are constant and the code is slightly faster that way
michael
parents:
3991
diff
changeset
|
7060 ff_init_cabac_states( &h->cabac); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7061 ff_init_cabac_decoder( &h->cabac, |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7062 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 7063 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7064 /* calculate pre-state */ |
| 2755 | 7065 for( i= 0; i < 460; i++ ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7066 int pre; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7067 if( h->slice_type == I_TYPE ) |
| 4594 | 7068 pre = av_clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7069 else |
| 4594 | 7070 pre = av_clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7071 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7072 if( pre <= 63 ) |
|
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
7073 h->cabac_state[i] = 2 * ( 63 - pre ) + 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7074 else |
|
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
7075 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 7076 } |
| 7077 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7078 for(;;){ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
7079 //START_TIMER |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7080 int ret = decode_mb_cabac(h); |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7081 int eos; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
7082 //STOP_TIMER("decode_mb_cabac") |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7083 |
| 2163 | 7084 if(ret>=0) hl_decode_mb(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7085 |
| 3316 | 7086 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7087 s->mb_y++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7088 |
| 2163 | 7089 if(ret>=0) ret = decode_mb_cabac(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7090 |
|
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
7091 if(ret>=0) hl_decode_mb(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7092 s->mb_y--; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7093 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7094 eos = get_cabac_terminate( &h->cabac ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7095 |
|
3948
3edbf131ee44
refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents:
3947
diff
changeset
|
7096 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) { |
| 5153 | 7097 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7098 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7099 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7100 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7101 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7102 if( ++s->mb_x >= s->mb_width ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7103 s->mb_x = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7104 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2392 | 7105 ++s->mb_y; |
| 3316 | 7106 if(FRAME_MBAFF) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7107 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7108 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7109 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7110 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7111 if( eos || s->mb_y >= s->mb_height ) { |
| 4600 | 7112 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7113 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7114 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7115 } |
| 1168 | 7116 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7117 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7118 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7119 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7120 int ret = decode_mb_cavlc(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7121 |
| 2163 | 7122 if(ret>=0) hl_decode_mb(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7123 |
| 3316 | 7124 if(ret>=0 && FRAME_MBAFF){ //FIXME optimal? or let mb_decode decode 16x32 ? |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7125 s->mb_y++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7126 ret = decode_mb_cavlc(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7127 |
| 2163 | 7128 if(ret>=0) hl_decode_mb(h); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7129 s->mb_y--; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7130 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7131 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7132 if(ret<0){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7133 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7134 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7135 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7136 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7137 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7138 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7139 if(++s->mb_x >= s->mb_width){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7140 s->mb_x=0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7141 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7142 ++s->mb_y; |
| 3316 | 7143 if(FRAME_MBAFF) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7144 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7145 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7146 if(s->mb_y >= s->mb_height){ |
| 4600 | 7147 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7148 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7149 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7150 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7151 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7152 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7153 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7154 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7155 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7156 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7157 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7158 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7159 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7160 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7161 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
| 4600 | 7162 tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7163 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 7164 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
| 7165 | |
| 7166 return 0; | |
| 7167 }else{ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7168 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
| 1168 | 7169 |
| 7170 return -1; | |
| 7171 } | |
| 7172 } | |
| 7173 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7174 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7175 |
| 1168 | 7176 #if 0 |
| 7177 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 7178 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 7179 int ret= decode_mb(h); | |
| 2967 | 7180 |
| 1168 | 7181 hl_decode_mb(h); |
| 7182 | |
| 7183 if(ret<0){ | |
| 3177 | 7184 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 7185 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
| 7186 | |
| 7187 return -1; | |
| 7188 } | |
| 2967 | 7189 |
| 1168 | 7190 if(++s->mb_x >= s->mb_width){ |
| 7191 s->mb_x=0; | |
| 7192 if(++s->mb_y >= s->mb_height){ | |
| 7193 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 7194 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
| 7195 | |
| 7196 return 0; | |
| 7197 }else{ | |
| 7198 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
| 7199 | |
| 7200 return -1; | |
| 7201 } | |
| 7202 } | |
| 7203 } | |
| 2967 | 7204 |
| 1168 | 7205 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ |
| 7206 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 7207 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
| 7208 | |
| 7209 return 0; | |
| 7210 }else{ | |
| 7211 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); | |
| 7212 | |
| 7213 return -1; | |
| 7214 } | |
| 7215 } | |
| 7216 } | |
| 7217 s->mb_x=0; | |
| 7218 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 7219 } | |
| 7220 #endif | |
| 7221 return -1; //not reached | |
| 7222 } | |
| 7223 | |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7224 static int decode_unregistered_user_data(H264Context *h, int size){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7225 MpegEncContext * const s = &h->s; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7226 uint8_t user_data[16+256]; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7227 int e, build, i; |
| 2967 | 7228 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7229 if(size<16) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7230 return -1; |
| 2967 | 7231 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7232 for(i=0; i<sizeof(user_data)-1 && i<size; i++){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7233 user_data[i]= get_bits(&s->gb, 8); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7234 } |
| 2967 | 7235 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7236 user_data[i]= 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7237 e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7238 if(e==1 && build>=0) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7239 h->x264_build= build; |
| 2967 | 7240 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7241 if(s->avctx->debug & FF_DEBUG_BUGS) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7242 av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7243 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7244 for(; i<size; i++) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7245 skip_bits(&s->gb, 8); |
| 2967 | 7246 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7247 return 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7248 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7249 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7250 static int decode_sei(H264Context *h){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7251 MpegEncContext * const s = &h->s; |
| 2967 | 7252 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7253 while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7254 int size, type; |
| 2967 | 7255 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7256 type=0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7257 do{ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7258 type+= show_bits(&s->gb, 8); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7259 }while(get_bits(&s->gb, 8) == 255); |
| 2967 | 7260 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7261 size=0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7262 do{ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7263 size+= show_bits(&s->gb, 8); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7264 }while(get_bits(&s->gb, 8) == 255); |
| 2967 | 7265 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7266 switch(type){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7267 case 5: |
| 3318 | 7268 if(decode_unregistered_user_data(h, size) < 0) |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7269 return -1; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7270 break; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7271 default: |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7272 skip_bits(&s->gb, 8*size); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7273 } |
| 2967 | 7274 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7275 //FIXME check bits here |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7276 align_get_bits(&s->gb); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7277 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7278 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7279 return 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7280 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7281 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7282 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7283 MpegEncContext * const s = &h->s; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7284 int cpb_count, i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7285 cpb_count = get_ue_golomb(&s->gb) + 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7286 get_bits(&s->gb, 4); /* bit_rate_scale */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7287 get_bits(&s->gb, 4); /* cpb_size_scale */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7288 for(i=0; i<cpb_count; i++){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7289 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7290 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7291 get_bits1(&s->gb); /* cbr_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7292 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7293 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7294 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7295 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7296 get_bits(&s->gb, 5); /* time_offset_length */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7297 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7298 |
| 1168 | 7299 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
| 7300 MpegEncContext * const s = &h->s; | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7301 int aspect_ratio_info_present_flag; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7302 unsigned int aspect_ratio_idc; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7303 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
| 1168 | 7304 |
| 7305 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 2967 | 7306 |
| 1168 | 7307 if( aspect_ratio_info_present_flag ) { |
| 7308 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 7309 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 7310 sps->sar.num= get_bits(&s->gb, 16); |
| 7311 sps->sar.den= get_bits(&s->gb, 16); | |
|
3196
15157293beea
fixing coverity warnig CID: 253 (reading over the end of the aspect_ratio array for illegal aspect ratios)
michael
parents:
3178
diff
changeset
|
7312 }else if(aspect_ratio_idc < 14){ |
| 1548 | 7313 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 7314 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7315 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 7316 return -1; |
| 7317 } | |
| 7318 }else{ | |
| 2967 | 7319 sps->sar.num= |
| 1548 | 7320 sps->sar.den= 0; |
| 1168 | 7321 } |
| 7322 // s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height); | |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7323 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7324 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7325 get_bits1(&s->gb); /* overscan_appropriate_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7326 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7327 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7328 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7329 get_bits(&s->gb, 3); /* video_format */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7330 get_bits1(&s->gb); /* video_full_range_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7331 if(get_bits1(&s->gb)){ /* colour_description_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7332 get_bits(&s->gb, 8); /* colour_primaries */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7333 get_bits(&s->gb, 8); /* transfer_characteristics */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7334 get_bits(&s->gb, 8); /* matrix_coefficients */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7335 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7336 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7337 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7338 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7339 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7340 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7341 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7342 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7343 sps->timing_info_present_flag = get_bits1(&s->gb); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7344 if(sps->timing_info_present_flag){ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7345 sps->num_units_in_tick = get_bits_long(&s->gb, 32); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7346 sps->time_scale = get_bits_long(&s->gb, 32); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7347 sps->fixed_frame_rate_flag = get_bits1(&s->gb); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7348 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7349 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7350 nal_hrd_parameters_present_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7351 if(nal_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7352 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7353 vcl_hrd_parameters_present_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7354 if(vcl_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7355 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7356 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7357 get_bits1(&s->gb); /* low_delay_hrd_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7358 get_bits1(&s->gb); /* pic_struct_present_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7359 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7360 sps->bitstream_restriction_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7361 if(sps->bitstream_restriction_flag){ |
| 4389 | 7362 unsigned int num_reorder_frames; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7363 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7364 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7365 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7366 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7367 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */ |
| 4389 | 7368 num_reorder_frames= get_ue_golomb(&s->gb); |
| 7369 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/ | |
| 7370 | |
| 7371 if(num_reorder_frames > 16 /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){ | |
| 7372 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", num_reorder_frames); | |
| 7373 return -1; | |
| 7374 } | |
| 7375 | |
| 7376 sps->num_reorder_frames= num_reorder_frames; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7377 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7378 |
| 1168 | 7379 return 0; |
| 7380 } | |
| 7381 | |
| 3004 | 7382 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, |
| 7383 const uint8_t *jvt_list, const uint8_t *fallback_list){ | |
| 2919 | 7384 MpegEncContext * const s = &h->s; |
| 7385 int i, last = 8, next = 8; | |
| 7386 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; | |
| 3004 | 7387 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ |
| 7388 memcpy(factors, fallback_list, size*sizeof(uint8_t)); | |
| 2919 | 7389 else |
| 7390 for(i=0;i<size;i++){ | |
| 7391 if(next) | |
| 7392 next = (last + get_se_golomb(&s->gb)) & 0xff; | |
| 3004 | 7393 if(!i && !next){ /* matrix not written, we use the preset one */ |
| 7394 memcpy(factors, jvt_list, size*sizeof(uint8_t)); | |
| 2919 | 7395 break; |
| 7396 } | |
| 7397 last = factors[scan[i]] = next ? next : last; | |
| 7398 } | |
| 7399 } | |
| 7400 | |
| 7401 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps, | |
| 7402 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){ | |
| 7403 MpegEncContext * const s = &h->s; | |
| 7404 int fallback_sps = !is_sps && sps->scaling_matrix_present; | |
| 7405 const uint8_t *fallback[4] = { | |
| 7406 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0], | |
| 7407 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1], | |
| 7408 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0], | |
| 7409 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1] | |
| 7410 }; | |
| 7411 if(get_bits1(&s->gb)){ | |
| 7412 sps->scaling_matrix_present |= is_sps; | |
| 3004 | 7413 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y |
| 7414 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr | |
| 7415 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb | |
| 7416 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y | |
| 7417 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr | |
| 7418 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb | |
| 2919 | 7419 if(is_sps || pps->transform_8x8_mode){ |
| 3004 | 7420 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y |
| 7421 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y | |
| 2919 | 7422 } |
| 7423 } else if(fallback_sps) { | |
| 7424 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t)); | |
| 7425 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t)); | |
| 7426 } | |
| 7427 } | |
| 7428 | |
| 5079 | 7429 /** |
| 7430 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec' | |
| 7431 */ | |
| 7432 static void * | |
| 7433 alloc_parameter_set(H264Context *h, void **vec, const unsigned int id, const unsigned int max, | |
| 7434 const size_t size, const char *name) | |
| 7435 { | |
| 7436 if(id>=max) { | |
| 7437 av_log(h->s.avctx, AV_LOG_ERROR, "%s_id (%d) out of range\n", name, id); | |
| 7438 return NULL; | |
| 7439 } | |
| 7440 | |
| 7441 if(!vec[id]) { | |
| 7442 vec[id] = av_mallocz(size); | |
| 7443 if(vec[id] == NULL) | |
| 7444 av_log(h->s.avctx, AV_LOG_ERROR, "cannot allocate memory for %s\n", name); | |
| 7445 } | |
| 7446 return vec[id]; | |
| 7447 } | |
| 7448 | |
| 1168 | 7449 static inline int decode_seq_parameter_set(H264Context *h){ |
| 7450 MpegEncContext * const s = &h->s; | |
| 1371 | 7451 int profile_idc, level_idc; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7452 unsigned int sps_id, tmp, mb_width, mb_height; |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7453 int i; |
| 1168 | 7454 SPS *sps; |
| 2967 | 7455 |
| 1168 | 7456 profile_idc= get_bits(&s->gb, 8); |
| 1371 | 7457 get_bits1(&s->gb); //constraint_set0_flag |
| 7458 get_bits1(&s->gb); //constraint_set1_flag | |
| 7459 get_bits1(&s->gb); //constraint_set2_flag | |
| 2312 | 7460 get_bits1(&s->gb); //constraint_set3_flag |
| 7461 get_bits(&s->gb, 4); // reserved | |
| 1168 | 7462 level_idc= get_bits(&s->gb, 8); |
| 7463 sps_id= get_ue_golomb(&s->gb); | |
| 2967 | 7464 |
| 5079 | 7465 sps = alloc_parameter_set(h, (void **)h->sps_buffers, sps_id, MAX_SPS_COUNT, sizeof(SPS), "sps"); |
| 7466 if(sps == NULL) | |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7467 return -1; |
| 5079 | 7468 |
| 1168 | 7469 sps->profile_idc= profile_idc; |
| 7470 sps->level_idc= level_idc; | |
| 2312 | 7471 |
| 2755 | 7472 if(sps->profile_idc >= 100){ //high profile |
| 7473 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc | |
| 7474 get_bits1(&s->gb); //residual_color_transform_flag | |
| 7475 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
| 7476 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
| 2763 | 7477 sps->transform_bypass = get_bits1(&s->gb); |
| 2919 | 7478 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8); |
| 7479 }else | |
| 7480 sps->scaling_matrix_present = 0; | |
| 2755 | 7481 |
| 1168 | 7482 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
| 7483 sps->poc_type= get_ue_golomb(&s->gb); | |
| 2967 | 7484 |
| 1168 | 7485 if(sps->poc_type == 0){ //FIXME #define |
| 7486 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 7487 } else if(sps->poc_type == 1){//FIXME #define | |
| 7488 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 7489 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 7490 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7491 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7492 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7493 if(tmp >= sizeof(sps->offset_for_ref_frame) / sizeof(sps->offset_for_ref_frame[0])){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7494 av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", tmp); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7495 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7496 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7497 sps->poc_cycle_length= tmp; |
| 2967 | 7498 |
| 1168 | 7499 for(i=0; i<sps->poc_cycle_length; i++) |
| 7500 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7501 }else if(sps->poc_type != 2){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7502 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 7503 return -1; |
| 7504 } | |
| 7505 | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7506 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7507 if(tmp > MAX_PICTURE_COUNT-2){ |
|
2254
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
7508 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n"); |
|
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
7509 } |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7510 sps->ref_frame_count= tmp; |
| 1371 | 7511 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7512 mb_width= get_ue_golomb(&s->gb) + 1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7513 mb_height= get_ue_golomb(&s->gb) + 1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7514 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 || |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7515 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7516 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n"); |
| 2422 | 7517 return -1; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7518 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7519 sps->mb_width = mb_width; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7520 sps->mb_height= mb_height; |
| 2422 | 7521 |
| 1168 | 7522 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
| 7523 if(!sps->frame_mbs_only_flag) | |
| 7524 sps->mb_aff= get_bits1(&s->gb); | |
| 7525 else | |
| 7526 sps->mb_aff= 0; | |
| 7527 | |
| 7528 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 7529 | |
| 3316 | 7530 #ifndef ALLOW_INTERLACE |
| 7531 if(sps->mb_aff) | |
| 3954 | 7532 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n"); |
| 3316 | 7533 #endif |
| 7534 if(!sps->direct_8x8_inference_flag && sps->mb_aff) | |
| 7535 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); | |
| 7536 | |
| 1371 | 7537 sps->crop= get_bits1(&s->gb); |
| 7538 if(sps->crop){ | |
| 7539 sps->crop_left = get_ue_golomb(&s->gb); | |
| 7540 sps->crop_right = get_ue_golomb(&s->gb); | |
| 7541 sps->crop_top = get_ue_golomb(&s->gb); | |
| 7542 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 7543 if(sps->crop_left || sps->crop_top){ | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
7544 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
| 1371 | 7545 } |
| 7546 }else{ | |
| 2967 | 7547 sps->crop_left = |
| 7548 sps->crop_right = | |
| 7549 sps->crop_top = | |
| 1371 | 7550 sps->crop_bottom= 0; |
| 7551 } | |
| 7552 | |
| 1168 | 7553 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 7554 if( sps->vui_parameters_present_flag ) | |
| 7555 decode_vui_parameters(h, sps); | |
| 2967 | 7556 |
| 1168 | 7557 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7558 av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s\n", |
| 1168 | 7559 sps_id, sps->profile_idc, sps->level_idc, |
| 7560 sps->poc_type, | |
| 7561 sps->ref_frame_count, | |
| 7562 sps->mb_width, sps->mb_height, | |
| 7563 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 7564 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 2967 | 7565 sps->crop_left, sps->crop_right, |
| 7566 sps->crop_top, sps->crop_bottom, | |
| 1168 | 7567 sps->vui_parameters_present_flag ? "VUI" : "" |
| 7568 ); | |
| 7569 } | |
| 7570 return 0; | |
| 7571 } | |
| 7572 | |
| 2755 | 7573 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
| 1168 | 7574 MpegEncContext * const s = &h->s; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7575 unsigned int tmp, pps_id= get_ue_golomb(&s->gb); |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7576 PPS *pps; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7577 |
| 5079 | 7578 pps = alloc_parameter_set(h, (void **)h->pps_buffers, pps_id, MAX_PPS_COUNT, sizeof(PPS), "pps"); |
| 7579 if(pps == NULL) | |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7580 return -1; |
| 2967 | 7581 |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7582 tmp= get_ue_golomb(&s->gb); |
| 5079 | 7583 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){ |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7584 av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n"); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7585 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7586 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7587 pps->sps_id= tmp; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7588 |
| 1168 | 7589 pps->cabac= get_bits1(&s->gb); |
| 7590 pps->pic_order_present= get_bits1(&s->gb); | |
| 7591 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 7592 if(pps->slice_group_count > 1 ){ | |
| 7593 pps->mb_slice_group_map_type= get_ue_golomb(&s->gb); | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7594 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 7595 switch(pps->mb_slice_group_map_type){ |
| 7596 case 0: | |
| 7597 #if 0 | |
| 7598 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 7599 | run_length[ i ] |1 |ue(v) | | |
| 7600 #endif | |
| 7601 break; | |
| 7602 case 2: | |
| 7603 #if 0 | |
| 7604 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 7605 |{ | | | | |
| 7606 | top_left_mb[ i ] |1 |ue(v) | | |
| 7607 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 7608 | } | | | | |
| 7609 #endif | |
| 7610 break; | |
| 7611 case 3: | |
| 7612 case 4: | |
| 7613 case 5: | |
| 7614 #if 0 | |
| 7615 | slice_group_change_direction_flag |1 |u(1) | | |
| 7616 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 7617 #endif | |
| 7618 break; | |
| 7619 case 6: | |
| 7620 #if 0 | |
| 7621 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 7622 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 7623 |) | | | | |
| 7624 | slice_group_id[ i ] |1 |u(v) | | |
| 7625 #endif | |
| 1214 | 7626 break; |
| 1168 | 7627 } |
| 7628 } | |
| 7629 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 7630 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4531 | 7631 if(pps->ref_count[0]-1 > 32-1 || pps->ref_count[1]-1 > 32-1){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7632 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7633 pps->ref_count[0]= pps->ref_count[1]= 1; |
| 1168 | 7634 return -1; |
| 7635 } | |
| 2967 | 7636 |
| 1168 | 7637 pps->weighted_pred= get_bits1(&s->gb); |
| 7638 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 7639 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 7640 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
| 7641 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
| 7642 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
| 7643 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 7644 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 2967 | 7645 |
|
3291
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7646 pps->transform_8x8_mode= 0; |
|
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7647 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit |
| 2919 | 7648 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t)); |
| 7649 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
| 2755 | 7650 |
| 7651 if(get_bits_count(&s->gb) < bit_length){ | |
| 7652 pps->transform_8x8_mode= get_bits1(&s->gb); | |
| 5079 | 7653 decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8); |
| 2755 | 7654 get_se_golomb(&s->gb); //second_chroma_qp_index_offset |
| 7655 } | |
| 2967 | 7656 |
| 1168 | 7657 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7658 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s %s\n", |
| 1168 | 7659 pps_id, pps->sps_id, |
| 7660 pps->cabac ? "CABAC" : "CAVLC", | |
| 7661 pps->slice_group_count, | |
| 7662 pps->ref_count[0], pps->ref_count[1], | |
| 7663 pps->weighted_pred ? "weighted" : "", | |
| 7664 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
| 7665 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
| 7666 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 2755 | 7667 pps->redundant_pic_cnt_present ? "REDU" : "", |
| 7668 pps->transform_8x8_mode ? "8x8DCT" : "" | |
| 1168 | 7669 ); |
| 7670 } | |
| 2967 | 7671 |
| 1168 | 7672 return 0; |
| 7673 } | |
| 7674 | |
| 7675 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ | |
| 7676 MpegEncContext * const s = &h->s; | |
| 7677 AVCodecContext * const avctx= s->avctx; | |
| 7678 int buf_index=0; | |
| 1322 | 7679 #if 0 |
| 1168 | 7680 int i; |
|
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7681 for(i=0; i<50; i++){ |
|
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7682 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]); |
| 1168 | 7683 } |
| 7684 #endif | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7685 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){ |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7686 h->slice_num = 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7687 s->current_picture_ptr= NULL; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7688 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7689 |
| 1168 | 7690 for(;;){ |
| 7691 int consumed; | |
| 7692 int dst_length; | |
| 7693 int bit_length; | |
| 7694 uint8_t *ptr; | |
| 2227 | 7695 int i, nalsize = 0; |
| 2967 | 7696 |
| 5170 | 7697 if(h->is_avc) { |
| 7698 if(buf_index >= buf_size) break; | |
| 7699 nalsize = 0; | |
| 7700 for(i = 0; i < h->nal_length_size; i++) | |
| 7701 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 7702 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ | |
| 7703 if(nalsize == 1){ | |
| 7704 buf_index++; | |
| 7705 continue; | |
| 7706 }else{ | |
| 7707 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); | |
| 7708 break; | |
| 7709 } | |
| 7710 } | |
| 7711 } else { | |
| 7712 // start code prefix search | |
| 7713 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 7714 // This should always succeed in the first iteration. | |
| 7715 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 7716 break; | |
| 7717 } | |
| 7718 | |
| 7719 if(buf_index+3 >= buf_size) break; | |
| 7720 | |
| 7721 buf_index+=3; | |
| 7722 } | |
| 2967 | 7723 |
|
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
7724 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
|
4828
58f1856608f6
scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents:
4795
diff
changeset
|
7725 if (ptr==NULL || dst_length < 0){ |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7726 return -1; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7727 } |
|
4829
e3161603a048
Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents:
4828
diff
changeset
|
7728 while(ptr[dst_length - 1] == 0 && dst_length > 0) |
| 3341 | 7729 dst_length--; |
|
4830
5a523aee7379
When dst_length == 0 bit_length has to be 0, too, but the current code still
diego
parents:
4829
diff
changeset
|
7730 bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1)); |
| 1168 | 7731 |
| 7732 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
7733 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", h->nal_unit_type, buf_index, buf_size, dst_length); |
| 1168 | 7734 } |
| 2967 | 7735 |
| 2227 | 7736 if (h->is_avc && (nalsize != consumed)) |
| 7737 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 7738 | |
| 1168 | 7739 buf_index += consumed; |
| 7740 | |
| 5127 | 7741 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME do not discard SEI id |
| 2792 | 7742 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
| 1168 | 7743 continue; |
| 2967 | 7744 |
| 1168 | 7745 switch(h->nal_unit_type){ |
| 7746 case NAL_IDR_SLICE: | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7747 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
| 1168 | 7748 case NAL_SLICE: |
| 7749 init_get_bits(&s->gb, ptr, bit_length); | |
| 7750 h->intra_gb_ptr= | |
| 7751 h->inter_gb_ptr= &s->gb; | |
| 7752 s->data_partitioning = 0; | |
| 2967 | 7753 |
| 2771 | 7754 if(decode_slice_header(h) < 0){ |
| 7755 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7756 break; | |
| 7757 } | |
|
3161
e3e94632c6e9
keyframe flag was wrong if SEIs followed the keyframe
lorenm
parents:
3145
diff
changeset
|
7758 s->current_picture_ptr->key_frame= (h->nal_unit_type == NAL_IDR_SLICE); |
| 2967 | 7759 if(h->redundant_pic_count==0 && s->hurry_up < 5 |
| 2793 | 7760 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) |
| 7761 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
| 7762 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
| 7763 && avctx->skip_frame < AVDISCARD_ALL) | |
| 1168 | 7764 decode_slice(h); |
| 7765 break; | |
| 7766 case NAL_DPA: | |
| 7767 init_get_bits(&s->gb, ptr, bit_length); | |
| 7768 h->intra_gb_ptr= | |
| 7769 h->inter_gb_ptr= NULL; | |
| 7770 s->data_partitioning = 1; | |
| 2967 | 7771 |
| 2771 | 7772 if(decode_slice_header(h) < 0){ |
| 7773 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7774 } | |
| 1168 | 7775 break; |
| 7776 case NAL_DPB: | |
| 7777 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 7778 h->intra_gb_ptr= &h->intra_gb; | |
| 7779 break; | |
| 7780 case NAL_DPC: | |
| 7781 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 7782 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 7783 |
| 2967 | 7784 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning |
|
4354
d18568fb0187
Avoid calling decode_slice when context_initialized is not set.
reimar
parents:
4344
diff
changeset
|
7785 && s->context_initialized |
| 2793 | 7786 && s->hurry_up < 5 |
| 7787 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) | |
| 7788 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
| 7789 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
| 7790 && avctx->skip_frame < AVDISCARD_ALL) | |
| 1168 | 7791 decode_slice(h); |
| 7792 break; | |
| 7793 case NAL_SEI: | |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7794 init_get_bits(&s->gb, ptr, bit_length); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7795 decode_sei(h); |
| 1168 | 7796 break; |
| 7797 case NAL_SPS: | |
| 7798 init_get_bits(&s->gb, ptr, bit_length); | |
| 7799 decode_seq_parameter_set(h); | |
| 2967 | 7800 |
| 1168 | 7801 if(s->flags& CODEC_FLAG_LOW_DELAY) |
| 7802 s->low_delay=1; | |
| 2967 | 7803 |
| 2538 | 7804 if(avctx->has_b_frames < 2) |
| 7805 avctx->has_b_frames= !s->low_delay; | |
| 1168 | 7806 break; |
| 7807 case NAL_PPS: | |
| 7808 init_get_bits(&s->gb, ptr, bit_length); | |
| 2967 | 7809 |
| 2755 | 7810 decode_picture_parameter_set(h, bit_length); |
| 1168 | 7811 |
| 7812 break; | |
| 2960 | 7813 case NAL_AUD: |
| 7814 case NAL_END_SEQUENCE: | |
| 7815 case NAL_END_STREAM: | |
| 7816 case NAL_FILLER_DATA: | |
| 7817 case NAL_SPS_EXT: | |
| 7818 case NAL_AUXILIARY_SLICE: | |
| 1168 | 7819 break; |
| 2979 | 7820 default: |
| 7821 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 2967 | 7822 } |
| 7823 } | |
| 7824 | |
| 1168 | 7825 return buf_index; |
| 7826 } | |
| 7827 | |
| 7828 /** | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7829 * returns the number of bytes consumed for building the current frame |
| 1168 | 7830 */ |
| 7831 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 7832 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 7833 pos -= s->parse_context.last_index; | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7834 if(pos<0) pos=0; // FIXME remove (unneeded?) |
| 2967 | 7835 |
| 1168 | 7836 return pos; |
| 7837 }else{ | |
| 5127 | 7838 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
| 1168 | 7839 if(pos+10>buf_size) pos=buf_size; // oops ;) |
| 7840 | |
| 7841 return pos; | |
| 7842 } | |
| 7843 } | |
| 7844 | |
| 2967 | 7845 static int decode_frame(AVCodecContext *avctx, |
| 1168 | 7846 void *data, int *data_size, |
| 7847 uint8_t *buf, int buf_size) | |
| 7848 { | |
| 7849 H264Context *h = avctx->priv_data; | |
| 7850 MpegEncContext *s = &h->s; | |
| 2967 | 7851 AVFrame *pict = data; |
| 1168 | 7852 int buf_index; |
| 2967 | 7853 |
| 1168 | 7854 s->flags= avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
7855 s->flags2= avctx->flags2; |
| 1168 | 7856 |
| 7857 /* no supplementary picture */ | |
| 7858 if (buf_size == 0) { | |
| 4556 | 7859 Picture *out; |
| 7860 int i, out_idx; | |
| 7861 | |
| 7862 //FIXME factorize this with the output code below | |
| 7863 out = h->delayed_pic[0]; | |
| 7864 out_idx = 0; | |
| 7865 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) | |
| 7866 if(h->delayed_pic[i]->poc < out->poc){ | |
| 7867 out = h->delayed_pic[i]; | |
| 7868 out_idx = i; | |
| 7869 } | |
| 7870 | |
| 7871 for(i=out_idx; h->delayed_pic[i]; i++) | |
| 7872 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
| 7873 | |
| 7874 if(out){ | |
| 7875 *data_size = sizeof(AVFrame); | |
| 7876 *pict= *(AVFrame*)out; | |
| 7877 } | |
| 7878 | |
| 1168 | 7879 return 0; |
| 7880 } | |
| 2967 | 7881 |
| 1168 | 7882 if(s->flags&CODEC_FLAG_TRUNCATED){ |
| 4975 | 7883 int next= ff_h264_find_frame_end(h, buf, buf_size); |
| 2967 | 7884 |
|
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4908
diff
changeset
|
7885 if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 ) |
| 1168 | 7886 return buf_size; |
| 7887 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 7888 } | |
| 7889 | |
| 2227 | 7890 if(h->is_avc && !h->got_avcC) { |
| 7891 int i, cnt, nalsize; | |
| 7892 unsigned char *p = avctx->extradata; | |
| 7893 if(avctx->extradata_size < 7) { | |
| 7894 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 7895 return -1; | |
| 7896 } | |
| 7897 if(*p != 1) { | |
| 7898 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 7899 return -1; | |
| 7900 } | |
| 7901 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 7902 so put a fake nal_length_size = 2 while parsing them */ | |
| 7903 h->nal_length_size = 2; | |
| 7904 // Decode sps from avcC | |
| 7905 cnt = *(p+5) & 0x1f; // Number of sps | |
| 7906 p += 6; | |
| 7907 for (i = 0; i < cnt; i++) { | |
| 4364 | 7908 nalsize = AV_RB16(p) + 2; |
|
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7909 if(decode_nal_units(h, p, nalsize) < 0) { |
| 2227 | 7910 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
| 7911 return -1; | |
| 7912 } | |
| 7913 p += nalsize; | |
| 2967 | 7914 } |
| 2227 | 7915 // Decode pps from avcC |
| 7916 cnt = *(p++); // Number of pps | |
| 7917 for (i = 0; i < cnt; i++) { | |
| 4364 | 7918 nalsize = AV_RB16(p) + 2; |
| 2227 | 7919 if(decode_nal_units(h, p, nalsize) != nalsize) { |
| 7920 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 7921 return -1; | |
| 7922 } | |
| 7923 p += nalsize; | |
| 2967 | 7924 } |
| 2227 | 7925 // Now store right nal length size, that will be use to parse all other nals |
| 7926 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 7927 // Do not reparse avcC | |
| 7928 h->got_avcC = 1; | |
| 7929 } | |
| 7930 | |
|
4507
b80c704183e9
always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents:
4391
diff
changeset
|
7931 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){ |
| 2967 | 7932 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) |
| 1168 | 7933 return -1; |
| 7934 } | |
| 7935 | |
| 7936 buf_index=decode_nal_units(h, buf, buf_size); | |
| 2967 | 7937 if(buf_index < 0) |
| 1168 | 7938 return -1; |
| 7939 | |
| 4620 | 7940 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ |
| 7941 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); | |
| 7942 return -1; | |
| 7943 } | |
| 7944 | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7945 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){ |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7946 Picture *out = s->current_picture_ptr; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7947 Picture *cur = s->current_picture_ptr; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7948 Picture *prev = h->delayed_output_pic; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7949 int i, pics, cross_idr, out_of_order, out_idx; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7950 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7951 s->mb_y= 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7952 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7953 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7954 s->current_picture_ptr->pict_type= s->pict_type; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7955 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7956 h->prev_frame_num_offset= h->frame_num_offset; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7957 h->prev_frame_num= h->frame_num; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7958 if(s->current_picture_ptr->reference){ |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7959 h->prev_poc_msb= h->poc_msb; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7960 h->prev_poc_lsb= h->poc_lsb; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7961 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7962 if(s->current_picture_ptr->reference) |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7963 execute_ref_pic_marking(h, h->mmco, h->mmco_index); |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7964 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7965 ff_er_frame_end(s); |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7966 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7967 MPV_frame_end(s); |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7968 |
| 2967 | 7969 //FIXME do something with unavailable reference frames |
| 7970 | |
| 2561 | 7971 #if 0 //decode order |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7972 *data_size = sizeof(AVFrame); |
| 2561 | 7973 #else |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7974 /* Sort B-frames into display order */ |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7975 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7976 if(h->sps.bitstream_restriction_flag |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7977 && s->avctx->has_b_frames < h->sps.num_reorder_frames){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7978 s->avctx->has_b_frames = h->sps.num_reorder_frames; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7979 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7980 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7981 |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
7982 pics = 0; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7983 while(h->delayed_pic[pics]) pics++; |
| 4388 | 7984 |
| 7985 assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0])); | |
| 7986 | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7987 h->delayed_pic[pics++] = cur; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7988 if(cur->reference == 0) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7989 cur->reference = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7990 |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
7991 cross_idr = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7992 for(i=0; h->delayed_pic[i]; i++) |
|
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
7993 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0) |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7994 cross_idr = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7995 |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7996 out = h->delayed_pic[0]; |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
7997 out_idx = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7998 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7999 if(h->delayed_pic[i]->poc < out->poc){ |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8000 out = h->delayed_pic[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8001 out_idx = i; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8002 } |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8003 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8004 out_of_order = !cross_idr && prev && out->poc < prev->poc; |
| 3125 | 8005 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
| 8006 { } | |
| 8007 else if(prev && pics <= s->avctx->has_b_frames) | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8008 out = prev; |
| 2923 | 8009 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) |
| 2967 | 8010 || (s->low_delay && |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8011 ((!cross_idr && prev && out->poc > prev->poc + 2) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8012 || cur->pict_type == B_TYPE))) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8013 { |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8014 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8015 s->avctx->has_b_frames++; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8016 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8017 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8018 else if(out_of_order) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8019 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8020 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8021 if(out_of_order || pics > s->avctx->has_b_frames){ |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8022 for(i=out_idx; h->delayed_pic[i]; i++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8023 h->delayed_pic[i] = h->delayed_pic[i+1]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8024 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8025 |
|
3297
9ae9653d706c
decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents:
3291
diff
changeset
|
8026 if(prev == out) |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8027 *data_size = 0; |
| 2561 | 8028 else |
| 8029 *data_size = sizeof(AVFrame); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8030 if(prev && prev != out && prev->reference == 1) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8031 prev->reference = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8032 h->delayed_output_pic = out; |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
8033 #endif |
| 2409 | 8034 |
| 2937 | 8035 if(out) |
| 8036 *pict= *(AVFrame*)out; | |
| 8037 else | |
| 8038 av_log(avctx, AV_LOG_DEBUG, "no picture\n"); | |
| 8039 } | |
| 8040 | |
| 8041 assert(pict->data[0] || !*data_size); | |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
8042 ff_print_debug_info(s, pict); |
| 1168 | 8043 //printf("out %d\n", (int)pict->data[0]); |
| 8044 #if 0 //? | |
| 8045 | |
| 8046 /* Return the Picture timestamp as the frame number */ | |
| 8047 /* we substract 1 because it is added on utils.c */ | |
| 8048 avctx->frame_number = s->picture_number - 1; | |
| 8049 #endif | |
| 8050 return get_consumed_bytes(s, buf_index, buf_size); | |
| 8051 } | |
| 8052 #if 0 | |
| 8053 static inline void fill_mb_avail(H264Context *h){ | |
| 8054 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
8055 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 8056 |
| 8057 if(s->mb_y){ | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
8058 h->mb_avail[0]= s->mb_x && h->slice_table[mb_xy - s->mb_stride - 1] == h->slice_num; |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
8059 h->mb_avail[1]= h->slice_table[mb_xy - s->mb_stride ] == h->slice_num; |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
8060 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 8061 }else{ |
| 8062 h->mb_avail[0]= | |
| 8063 h->mb_avail[1]= | |
| 8064 h->mb_avail[2]= 0; | |
| 8065 } | |
| 8066 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 8067 h->mb_avail[4]= 1; //FIXME move out | |
| 8068 h->mb_avail[5]= 0; //FIXME move out | |
| 8069 } | |
| 8070 #endif | |
| 8071 | |
| 8072 #if 0 //selftest | |
| 8073 #define COUNT 8000 | |
| 8074 #define SIZE (COUNT*40) | |
| 8075 int main(){ | |
| 8076 int i; | |
| 8077 uint8_t temp[SIZE]; | |
| 8078 PutBitContext pb; | |
| 8079 GetBitContext gb; | |
| 8080 // int int_temp[10000]; | |
| 8081 DSPContext dsp; | |
| 8082 AVCodecContext avctx; | |
| 2967 | 8083 |
| 1168 | 8084 dsputil_init(&dsp, &avctx); |
| 8085 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
8086 init_put_bits(&pb, temp, SIZE); |
| 1168 | 8087 printf("testing unsigned exp golomb\n"); |
| 8088 for(i=0; i<COUNT; i++){ | |
| 8089 START_TIMER | |
| 8090 set_ue_golomb(&pb, i); | |
| 8091 STOP_TIMER("set_ue_golomb"); | |
| 8092 } | |
| 8093 flush_put_bits(&pb); | |
| 2967 | 8094 |
| 1168 | 8095 init_get_bits(&gb, temp, 8*SIZE); |
| 8096 for(i=0; i<COUNT; i++){ | |
| 8097 int j, s; | |
| 2967 | 8098 |
| 1168 | 8099 s= show_bits(&gb, 24); |
| 2967 | 8100 |
| 1168 | 8101 START_TIMER |
| 8102 j= get_ue_golomb(&gb); | |
| 8103 if(j != i){ | |
| 5127 | 8104 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
| 1168 | 8105 // return -1; |
| 8106 } | |
| 8107 STOP_TIMER("get_ue_golomb"); | |
| 8108 } | |
| 2967 | 8109 |
| 8110 | |
| 1524 | 8111 init_put_bits(&pb, temp, SIZE); |
| 1168 | 8112 printf("testing signed exp golomb\n"); |
| 8113 for(i=0; i<COUNT; i++){ | |
| 8114 START_TIMER | |
| 8115 set_se_golomb(&pb, i - COUNT/2); | |
| 8116 STOP_TIMER("set_se_golomb"); | |
| 8117 } | |
| 8118 flush_put_bits(&pb); | |
| 2967 | 8119 |
| 1168 | 8120 init_get_bits(&gb, temp, 8*SIZE); |
| 8121 for(i=0; i<COUNT; i++){ | |
| 8122 int j, s; | |
| 2967 | 8123 |
| 1168 | 8124 s= show_bits(&gb, 24); |
| 2967 | 8125 |
| 1168 | 8126 START_TIMER |
| 8127 j= get_se_golomb(&gb); | |
| 8128 if(j != i - COUNT/2){ | |
| 5127 | 8129 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
| 1168 | 8130 // return -1; |
| 8131 } | |
| 8132 STOP_TIMER("get_se_golomb"); | |
| 8133 } | |
| 8134 | |
| 8135 printf("testing 4x4 (I)DCT\n"); | |
| 2967 | 8136 |
| 1168 | 8137 DCTELEM block[16]; |
| 8138 uint8_t src[16], ref[16]; | |
| 8139 uint64_t error= 0, max_error=0; | |
| 8140 | |
| 8141 for(i=0; i<COUNT; i++){ | |
| 8142 int j; | |
| 8143 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 8144 for(j=0; j<16; j++){ | |
| 8145 ref[j]= random()%255; | |
| 8146 src[j]= random()%255; | |
| 8147 } | |
| 8148 | |
| 8149 h264_diff_dct_c(block, src, ref, 4); | |
| 2967 | 8150 |
| 1168 | 8151 //normalize |
| 8152 for(j=0; j<16; j++){ | |
| 8153 // printf("%d ", block[j]); | |
| 8154 block[j]= block[j]*4; | |
| 8155 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 8156 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 8157 } | |
| 8158 // printf("\n"); | |
| 2967 | 8159 |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
8160 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 8161 /* for(j=0; j<16; j++){ |
| 8162 printf("%d ", ref[j]); | |
| 8163 } | |
| 8164 printf("\n");*/ | |
| 2967 | 8165 |
| 1168 | 8166 for(j=0; j<16; j++){ |
| 4001 | 8167 int diff= FFABS(src[j] - ref[j]); |
| 2967 | 8168 |
| 1168 | 8169 error+= diff*diff; |
| 8170 max_error= FFMAX(max_error, diff); | |
| 8171 } | |
| 8172 } | |
| 8173 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 8174 #if 0 | |
| 8175 printf("testing quantizer\n"); | |
| 8176 for(qp=0; qp<52; qp++){ | |
| 8177 for(i=0; i<16; i++) | |
| 8178 src1_block[i]= src2_block[i]= random()%255; | |
| 2967 | 8179 |
| 1168 | 8180 } |
| 8181 #endif | |
| 8182 printf("Testing NAL layer\n"); | |
| 2967 | 8183 |
| 1168 | 8184 uint8_t bitstream[COUNT]; |
| 8185 uint8_t nal[COUNT*2]; | |
| 8186 H264Context h; | |
| 8187 memset(&h, 0, sizeof(H264Context)); | |
| 2967 | 8188 |
| 1168 | 8189 for(i=0; i<COUNT; i++){ |
| 8190 int zeros= i; | |
| 8191 int nal_length; | |
| 8192 int consumed; | |
| 8193 int out_length; | |
| 8194 uint8_t *out; | |
| 8195 int j; | |
| 2967 | 8196 |
| 1168 | 8197 for(j=0; j<COUNT; j++){ |
| 8198 bitstream[j]= (random() % 255) + 1; | |
| 8199 } | |
| 2967 | 8200 |
| 1168 | 8201 for(j=0; j<zeros; j++){ |
| 8202 int pos= random() % COUNT; | |
| 8203 while(bitstream[pos] == 0){ | |
| 8204 pos++; | |
| 8205 pos %= COUNT; | |
| 8206 } | |
| 8207 bitstream[pos]=0; | |
| 8208 } | |
| 2967 | 8209 |
| 1168 | 8210 START_TIMER |
| 2967 | 8211 |
| 1168 | 8212 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); |
| 8213 if(nal_length<0){ | |
| 8214 printf("encoding failed\n"); | |
| 8215 return -1; | |
| 8216 } | |
| 2967 | 8217 |
| 1168 | 8218 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); |
| 8219 | |
| 8220 STOP_TIMER("NAL") | |
| 2967 | 8221 |
| 1168 | 8222 if(out_length != COUNT){ |
| 8223 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 8224 return -1; | |
| 8225 } | |
| 2967 | 8226 |
| 1168 | 8227 if(consumed != nal_length){ |
| 8228 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 8229 return -1; | |
| 8230 } | |
| 2967 | 8231 |
| 1168 | 8232 if(memcmp(bitstream, out, COUNT)){ |
| 5127 | 8233 printf("mismatch\n"); |
| 1168 | 8234 return -1; |
| 8235 } | |
| 8236 } | |
| 2967 | 8237 |
| 1168 | 8238 printf("Testing RBSP\n"); |
| 2967 | 8239 |
| 8240 | |
| 1168 | 8241 return 0; |
| 8242 } | |
| 8243 #endif | |
| 8244 | |
| 8245 | |
| 8246 static int decode_end(AVCodecContext *avctx) | |
| 8247 { | |
| 8248 H264Context *h = avctx->priv_data; | |
| 8249 MpegEncContext *s = &h->s; | |
| 2967 | 8250 |
| 5174 | 8251 av_freep(&h->rbsp_buffer[0]); |
| 8252 av_freep(&h->rbsp_buffer[1]); | |
| 1168 | 8253 free_tables(h); //FIXME cleanup init stuff perhaps |
| 8254 MPV_common_end(s); | |
| 8255 | |
| 8256 // memset(h, 0, sizeof(H264Context)); | |
| 2967 | 8257 |
| 1168 | 8258 return 0; |
| 8259 } | |
| 8260 | |
| 8261 | |
| 8262 AVCodec h264_decoder = { | |
| 8263 "h264", | |
| 8264 CODEC_TYPE_VIDEO, | |
| 8265 CODEC_ID_H264, | |
| 8266 sizeof(H264Context), | |
| 8267 decode_init, | |
| 8268 NULL, | |
| 8269 decode_end, | |
| 8270 decode_frame, | |
| 2453 | 8271 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 2640 | 8272 .flush= flush_dpb, |
| 1168 | 8273 }; |
| 8274 | |
| 1234 | 8275 #include "svq3.c" |
