Mercurial > libavcodec.hg
annotate h264.c @ 5327:de0e893ef264 libavcodec
Remove redundant assignment of CODEC_ID_BMP.
patch by mark cox melbournemark+ffmpeg _at_ gmail.com
thread: [PATCH] Remove unessesary assignment of CODEC_ID_BMP
date: Mon, 9 Jul 2007 20:12:28 +1000
| author | aurel |
|---|---|
| date | Sat, 14 Jul 2007 17:14:16 +0000 |
| parents | b2a95ab5d017 |
| children | 5c1695f0f3e4 |
| 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 */ | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
1601 static inline int get_chroma_qp(H264Context *h, int t, int qscale){ |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
1602 return h->pps.chroma_qp_table[t][qscale & 0xff]; |
| 1168 | 1603 } |
| 1604 | |
| 5127 | 1605 //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
|
1606 //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
|
1607 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){ |
| 1168 | 1608 int i; |
| 1609 const int * const quant_table= quant_coeff[qscale]; | |
| 1610 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1611 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1612 const unsigned int threshold2= (threshold1<<1); | |
| 1613 int last_non_zero; | |
| 1614 | |
|
4553
1a714d3f0233
cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents:
4546
diff
changeset
|
1615 if(separate_dc){ |
| 1168 | 1616 if(qscale<=18){ |
| 1617 //avoid overflows | |
| 1618 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1619 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1620 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1621 | |
| 1622 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1623 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1624 if(level>0){ | |
| 1625 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1626 block[0]= level; | |
| 1627 }else{ | |
| 1628 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1629 block[0]= -level; | |
| 1630 } | |
| 1631 // last_non_zero = i; | |
| 1632 }else{ | |
| 1633 block[0]=0; | |
| 1634 } | |
| 1635 }else{ | |
| 1636 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1637 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1638 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1639 | |
| 1640 int level= block[0]*quant_table[0]; | |
| 1641 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1642 if(level>0){ | |
| 1643 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1644 block[0]= level; | |
| 1645 }else{ | |
| 1646 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1647 block[0]= -level; | |
| 1648 } | |
| 1649 // last_non_zero = i; | |
| 1650 }else{ | |
| 1651 block[0]=0; | |
| 1652 } | |
| 1653 } | |
| 1654 last_non_zero= 0; | |
| 1655 i=1; | |
| 1656 }else{ | |
| 1657 last_non_zero= -1; | |
| 1658 i=0; | |
| 1659 } | |
| 1660 | |
| 1661 for(; i<16; i++){ | |
| 1662 const int j= scantable[i]; | |
| 1663 int level= block[j]*quant_table[j]; | |
| 1664 | |
| 1665 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1666 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1667 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1668 if(level>0){ | |
| 1669 level= (bias + level)>>QUANT_SHIFT; | |
| 1670 block[j]= level; | |
| 1671 }else{ | |
| 1672 level= (bias - level)>>QUANT_SHIFT; | |
| 1673 block[j]= -level; | |
| 1674 } | |
| 1675 last_non_zero = i; | |
| 1676 }else{ | |
| 1677 block[j]=0; | |
| 1678 } | |
| 1679 } | |
| 1680 | |
| 1681 return last_non_zero; | |
| 1682 } | |
| 1683 | |
| 1684 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1685 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1686 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1687 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1688 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1689 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1690 } | |
| 1691 | |
| 1692 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1693 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1694 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1695 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1696 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1697 } | |
| 1698 | |
| 1699 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1700 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1701 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 2967 | 1702 |
| 1703 ((uint32_t*)(src+0*stride))[0]= | |
| 1704 ((uint32_t*)(src+1*stride))[0]= | |
| 1705 ((uint32_t*)(src+2*stride))[0]= | |
| 1706 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1707 } |
| 1708 | |
| 1709 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1710 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 2967 | 1711 |
| 1712 ((uint32_t*)(src+0*stride))[0]= | |
| 1713 ((uint32_t*)(src+1*stride))[0]= | |
| 1714 ((uint32_t*)(src+2*stride))[0]= | |
| 1715 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1716 } |
| 1717 | |
| 1718 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1719 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 2967 | 1720 |
| 1721 ((uint32_t*)(src+0*stride))[0]= | |
| 1722 ((uint32_t*)(src+1*stride))[0]= | |
| 1723 ((uint32_t*)(src+2*stride))[0]= | |
| 1724 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1168 | 1725 } |
| 1726 | |
| 1727 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1728 ((uint32_t*)(src+0*stride))[0]= |
| 1729 ((uint32_t*)(src+1*stride))[0]= | |
| 1730 ((uint32_t*)(src+2*stride))[0]= | |
| 1168 | 1731 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; |
| 1732 } | |
| 1733 | |
| 1734 | |
| 1735 #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
|
1736 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
|
1737 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
|
1738 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
|
1739 const int av_unused t7= topright[3];\ |
| 1168 | 1740 |
| 1741 #define LOAD_LEFT_EDGE\ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1742 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
|
1743 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
|
1744 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
|
1745 const int av_unused l3= src[-1+3*stride];\ |
| 1168 | 1746 |
| 1747 #define LOAD_TOP_EDGE\ | |
|
5083
ce36118abbbb
rename attribute_unused to av_unused and moves its declaration to common.h
benoit
parents:
5079
diff
changeset
|
1748 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
|
1749 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
|
1750 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
|
1751 const int av_unused t3= src[ 3-1*stride];\ |
| 1168 | 1752 |
| 1753 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1754 const int lt= src[-1-1*stride]; | |
| 1755 LOAD_TOP_EDGE | |
| 1756 LOAD_LEFT_EDGE | |
| 1757 | |
| 2967 | 1758 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; |
| 1168 | 1759 src[0+2*stride]= |
| 2967 | 1760 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; |
| 1168 | 1761 src[0+1*stride]= |
| 1762 src[1+2*stride]= | |
| 2967 | 1763 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; |
| 1168 | 1764 src[0+0*stride]= |
| 1765 src[1+1*stride]= | |
| 1766 src[2+2*stride]= | |
| 2967 | 1767 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; |
| 1168 | 1768 src[1+0*stride]= |
| 1769 src[2+1*stride]= | |
| 1770 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1771 src[2+0*stride]= | |
| 1772 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1773 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1774 } |
| 1168 | 1775 |
| 1776 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1777 LOAD_TOP_EDGE |
| 1778 LOAD_TOP_RIGHT_EDGE | |
| 1779 // LOAD_LEFT_EDGE | |
| 1168 | 1780 |
| 1781 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1782 src[1+0*stride]= | |
| 1783 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1784 src[2+0*stride]= | |
| 1785 src[1+1*stride]= | |
| 1786 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1787 src[3+0*stride]= | |
| 1788 src[2+1*stride]= | |
| 1789 src[1+2*stride]= | |
| 1790 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1791 src[3+1*stride]= | |
| 1792 src[2+2*stride]= | |
| 1793 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1794 src[3+2*stride]= | |
| 1795 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1796 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1797 } |
| 1168 | 1798 |
| 1799 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1800 const int lt= src[-1-1*stride]; | |
| 2967 | 1801 LOAD_TOP_EDGE |
| 1802 LOAD_LEFT_EDGE | |
| 1168 | 1803 |
| 1804 src[0+0*stride]= | |
| 1805 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1806 src[1+0*stride]= | |
| 1807 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1808 src[2+0*stride]= | |
| 1809 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1810 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1811 src[0+1*stride]= | |
| 1812 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1813 src[1+1*stride]= | |
| 1814 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1815 src[2+1*stride]= | |
| 1816 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1817 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1818 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1819 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1820 } |
| 1168 | 1821 |
| 1822 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1823 LOAD_TOP_EDGE |
| 1824 LOAD_TOP_RIGHT_EDGE | |
| 1168 | 1825 |
| 1826 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1827 src[1+0*stride]= | |
| 1828 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1829 src[2+0*stride]= | |
| 1830 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1831 src[3+0*stride]= | |
| 1832 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1833 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1834 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1835 src[1+1*stride]= | |
| 1836 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1837 src[2+1*stride]= | |
| 1838 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1839 src[3+1*stride]= | |
| 1840 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1841 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1842 } |
| 1168 | 1843 |
| 1844 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2967 | 1845 LOAD_LEFT_EDGE |
| 1168 | 1846 |
| 1847 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 1848 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1849 src[2+0*stride]= | |
| 1850 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 1851 src[3+0*stride]= | |
| 1852 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1853 src[2+1*stride]= | |
| 1854 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 1855 src[3+1*stride]= | |
| 1856 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 1857 src[3+2*stride]= | |
| 1858 src[1+3*stride]= | |
| 1859 src[0+3*stride]= | |
| 1860 src[2+2*stride]= | |
| 1861 src[2+3*stride]= | |
| 1862 src[3+3*stride]=l3; | |
| 1282 | 1863 } |
| 2967 | 1864 |
| 1168 | 1865 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ |
| 1866 const int lt= src[-1-1*stride]; | |
| 2967 | 1867 LOAD_TOP_EDGE |
| 1868 LOAD_LEFT_EDGE | |
| 1168 | 1869 |
| 1870 src[0+0*stride]= | |
| 1871 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 1872 src[1+0*stride]= | |
| 1873 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1874 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1875 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1876 src[0+1*stride]= | |
| 1877 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 1878 src[1+1*stride]= | |
| 1879 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1880 src[0+2*stride]= | |
| 1881 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 1882 src[1+2*stride]= | |
| 1883 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1884 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 1885 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 1886 } |
| 1168 | 1887 |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1888 void ff_pred16x16_vertical_c(uint8_t *src, int stride){ |
| 1168 | 1889 int i; |
| 1890 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1891 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 1892 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 1893 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 2967 | 1894 |
| 1168 | 1895 for(i=0; i<16; i++){ |
| 1896 ((uint32_t*)(src+i*stride))[0]= a; | |
| 1897 ((uint32_t*)(src+i*stride))[1]= b; | |
| 1898 ((uint32_t*)(src+i*stride))[2]= c; | |
| 1899 ((uint32_t*)(src+i*stride))[3]= d; | |
| 1900 } | |
| 1901 } | |
| 1902 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1903 void ff_pred16x16_horizontal_c(uint8_t *src, int stride){ |
| 1168 | 1904 int i; |
| 1905 | |
| 1906 for(i=0; i<16; i++){ | |
| 1907 ((uint32_t*)(src+i*stride))[0]= | |
| 1908 ((uint32_t*)(src+i*stride))[1]= | |
| 1909 ((uint32_t*)(src+i*stride))[2]= | |
| 1910 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 1911 } | |
| 1912 } | |
| 1913 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1914 void ff_pred16x16_dc_c(uint8_t *src, int stride){ |
| 1168 | 1915 int i, dc=0; |
| 1916 | |
| 1917 for(i=0;i<16; i++){ | |
| 1918 dc+= src[-1+i*stride]; | |
| 1919 } | |
| 2967 | 1920 |
| 1168 | 1921 for(i=0;i<16; i++){ |
| 1922 dc+= src[i-stride]; | |
| 1923 } | |
| 1924 | |
| 1925 dc= 0x01010101*((dc + 16)>>5); | |
| 1926 | |
| 1927 for(i=0; i<16; i++){ | |
| 1928 ((uint32_t*)(src+i*stride))[0]= | |
| 1929 ((uint32_t*)(src+i*stride))[1]= | |
| 1930 ((uint32_t*)(src+i*stride))[2]= | |
| 1931 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1932 } | |
| 1933 } | |
| 1934 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
1935 void ff_pred16x16_left_dc_c(uint8_t *src, int stride){ |
| 1168 | 1936 int i, dc=0; |
| 1937 | |
| 1938 for(i=0;i<16; i++){ | |
| 1939 dc+= src[-1+i*stride]; | |
| 1940 } | |
| 2967 | 1941 |
| 1168 | 1942 dc= 0x01010101*((dc + 8)>>4); |
| 1943 | |
| 1944 for(i=0; i<16; i++){ | |
| 1945 ((uint32_t*)(src+i*stride))[0]= | |
| 1946 ((uint32_t*)(src+i*stride))[1]= | |
| 1947 ((uint32_t*)(src+i*stride))[2]= | |
| 1948 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1949 } | |
| 1950 } | |
| 1951 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
1952 void ff_pred16x16_top_dc_c(uint8_t *src, int stride){ |
| 1168 | 1953 int i, dc=0; |
| 1954 | |
| 1955 for(i=0;i<16; i++){ | |
| 1956 dc+= src[i-stride]; | |
| 1957 } | |
| 1958 dc= 0x01010101*((dc + 8)>>4); | |
| 1959 | |
| 1960 for(i=0; i<16; i++){ | |
| 1961 ((uint32_t*)(src+i*stride))[0]= | |
| 1962 ((uint32_t*)(src+i*stride))[1]= | |
| 1963 ((uint32_t*)(src+i*stride))[2]= | |
| 1964 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1965 } | |
| 1966 } | |
| 1967 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
1968 void ff_pred16x16_128_dc_c(uint8_t *src, int stride){ |
| 1168 | 1969 int i; |
| 1970 | |
| 1971 for(i=0; i<16; i++){ | |
| 1972 ((uint32_t*)(src+i*stride))[0]= | |
| 1973 ((uint32_t*)(src+i*stride))[1]= | |
| 1974 ((uint32_t*)(src+i*stride))[2]= | |
| 1975 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 1976 } | |
| 1977 } | |
| 1978 | |
| 1234 | 1979 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
|
1980 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1981 int a; |
| 4176 | 1982 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
|
1983 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
|
1984 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
|
1985 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
|
1986 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
|
1987 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
|
1988 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
|
1989 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1990 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
|
1991 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
|
1992 } |
| 1234 | 1993 if(svq3){ |
| 1994 H = ( 5*(H/4) ) / 16; | |
| 1995 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1996 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1997 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1998 i = H; H = V; V = i; |
| 1234 | 1999 }else{ |
| 2000 H = ( 5*H+32 ) >> 6; | |
| 2001 V = ( 5*V+32 ) >> 6; | |
| 2002 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2003 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2004 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
|
2005 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
|
2006 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2007 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2008 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
|
2009 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
|
2010 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
|
2011 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
|
2012 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
|
2013 b += 4*H; |
| 1168 | 2014 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2015 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2016 } |
| 1168 | 2017 } |
| 2018 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2019 void ff_pred16x16_plane_c(uint8_t *src, int stride){ |
| 1234 | 2020 pred16x16_plane_compat_c(src, stride, 0); |
| 2021 } | |
| 2022 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2023 void ff_pred8x8_vertical_c(uint8_t *src, int stride){ |
| 1168 | 2024 int i; |
| 2025 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2026 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2967 | 2027 |
| 1168 | 2028 for(i=0; i<8; i++){ |
| 2029 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2030 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2031 } | |
| 2032 } | |
| 2033 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2034 void ff_pred8x8_horizontal_c(uint8_t *src, int stride){ |
| 1168 | 2035 int i; |
| 2036 | |
| 2037 for(i=0; i<8; i++){ | |
| 2038 ((uint32_t*)(src+i*stride))[0]= | |
| 2039 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 2040 } | |
| 2041 } | |
| 2042 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2043 void ff_pred8x8_128_dc_c(uint8_t *src, int stride){ |
| 1168 | 2044 int i; |
| 2045 | |
| 2755 | 2046 for(i=0; i<8; i++){ |
| 2967 | 2047 ((uint32_t*)(src+i*stride))[0]= |
| 1168 | 2048 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; |
| 2049 } | |
| 2050 } | |
| 2051 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2052 void ff_pred8x8_left_dc_c(uint8_t *src, int stride){ |
| 1168 | 2053 int i; |
| 2054 int dc0, dc2; | |
| 2055 | |
| 2056 dc0=dc2=0; | |
| 2057 for(i=0;i<4; i++){ | |
| 2058 dc0+= src[-1+i*stride]; | |
| 2059 dc2+= src[-1+(i+4)*stride]; | |
| 2060 } | |
| 2061 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2062 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2063 | |
| 2064 for(i=0; i<4; i++){ | |
| 2065 ((uint32_t*)(src+i*stride))[0]= | |
| 2066 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 2067 } | |
| 2068 for(i=4; i<8; i++){ | |
| 2069 ((uint32_t*)(src+i*stride))[0]= | |
| 2070 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 2071 } | |
| 2072 } | |
| 2073 | |
|
5066
27afc3835257
Export the four remaining H.264 decoder intra prediction functions for reuse in
takis
parents:
5023
diff
changeset
|
2074 void ff_pred8x8_top_dc_c(uint8_t *src, int stride){ |
| 1168 | 2075 int i; |
| 2076 int dc0, dc1; | |
| 2077 | |
| 2078 dc0=dc1=0; | |
| 2079 for(i=0;i<4; i++){ | |
| 2080 dc0+= src[i-stride]; | |
| 2081 dc1+= src[4+i-stride]; | |
| 2082 } | |
| 2083 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2084 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2085 | |
| 2086 for(i=0; i<4; i++){ | |
| 2087 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2088 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2089 } | |
| 2090 for(i=4; i<8; i++){ | |
| 2091 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2092 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2093 } | |
| 2094 } | |
| 2095 | |
| 2096 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2097 void ff_pred8x8_dc_c(uint8_t *src, int stride){ |
| 1168 | 2098 int i; |
| 2099 int dc0, dc1, dc2, dc3; | |
| 2100 | |
| 2101 dc0=dc1=dc2=0; | |
| 2102 for(i=0;i<4; i++){ | |
| 2103 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 2104 dc1+= src[4+i-stride]; | |
| 2105 dc2+= src[-1+(i+4)*stride]; | |
| 2106 } | |
| 2107 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 2108 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 2109 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2110 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2111 | |
| 2112 for(i=0; i<4; i++){ | |
| 2113 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2114 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2115 } | |
| 2116 for(i=4; i<8; i++){ | |
| 2117 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 2118 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 2119 } | |
| 2120 } | |
| 2121 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2122 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
|
2123 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2124 int a; |
| 4176 | 2125 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
|
2126 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
|
2127 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
|
2128 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
|
2129 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
|
2130 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
|
2131 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
|
2132 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2133 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
|
2134 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
|
2135 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2136 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2137 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2138 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2139 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
|
2140 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
|
2141 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2142 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2143 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2144 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
|
2145 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
|
2146 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
|
2147 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
|
2148 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
|
2149 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
|
2150 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
|
2151 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2152 } |
| 1168 | 2153 } |
| 2154 | |
| 2755 | 2155 #define SRC(x,y) src[(x)+(y)*stride] |
| 2156 #define PL(y) \ | |
| 2157 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; | |
| 2158 #define PREDICT_8x8_LOAD_LEFT \ | |
| 2159 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ | |
| 2160 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ | |
| 2161 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
|
2162 const int l7 av_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 |
| 2755 | 2163 |
| 2164 #define PT(x) \ | |
| 2165 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2166 #define PREDICT_8x8_LOAD_TOP \ | |
| 2167 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ | |
| 2168 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ | |
| 2169 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
|
2170 const int t7 av_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ |
| 2757 | 2171 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 |
| 2755 | 2172 |
| 2173 #define PTR(x) \ | |
| 2174 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2175 #define PREDICT_8x8_LOAD_TOPRIGHT \ | |
| 2176 int t8, t9, t10, t11, t12, t13, t14, t15; \ | |
| 2177 if(has_topright) { \ | |
| 2178 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \ | |
| 2179 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \ | |
| 2180 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1); | |
| 2181 | |
| 2182 #define PREDICT_8x8_LOAD_TOPLEFT \ | |
| 2757 | 2183 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2 |
| 2755 | 2184 |
| 2185 #define PREDICT_8x8_DC(v) \ | |
| 2186 int y; \ | |
| 2187 for( y = 0; y < 8; y++ ) { \ | |
| 2188 ((uint32_t*)src)[0] = \ | |
| 2189 ((uint32_t*)src)[1] = v; \ | |
| 2190 src += stride; \ | |
| 2191 } | |
| 2192 | |
| 2193 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2194 { | |
| 2195 PREDICT_8x8_DC(0x80808080); | |
| 2196 } | |
| 2197 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2198 { | |
| 2199 PREDICT_8x8_LOAD_LEFT; | |
| 2200 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101; | |
| 2201 PREDICT_8x8_DC(dc); | |
| 2202 } | |
| 2203 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2204 { | |
| 2205 PREDICT_8x8_LOAD_TOP; | |
| 2206 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101; | |
| 2207 PREDICT_8x8_DC(dc); | |
| 2208 } | |
| 2209 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2210 { | |
| 2211 PREDICT_8x8_LOAD_LEFT; | |
| 2212 PREDICT_8x8_LOAD_TOP; | |
| 2213 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7 | |
| 2214 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101; | |
| 2215 PREDICT_8x8_DC(dc); | |
| 2216 } | |
| 2217 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2218 { | |
| 2219 PREDICT_8x8_LOAD_LEFT; | |
| 2220 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\ | |
| 2221 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y | |
| 2222 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7); | |
| 2223 #undef ROW | |
| 2224 } | |
| 2225 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2226 { | |
| 2227 int y; | |
| 2228 PREDICT_8x8_LOAD_TOP; | |
| 2229 src[0] = t0; | |
| 2230 src[1] = t1; | |
| 2231 src[2] = t2; | |
| 2232 src[3] = t3; | |
| 2233 src[4] = t4; | |
| 2234 src[5] = t5; | |
| 2235 src[6] = t6; | |
| 2236 src[7] = t7; | |
| 2237 for( y = 1; y < 8; y++ ) | |
| 2238 *(uint64_t*)(src+y*stride) = *(uint64_t*)src; | |
| 2239 } | |
| 2240 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2241 { | |
| 2242 PREDICT_8x8_LOAD_TOP; | |
| 2243 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2244 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2245 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2246 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2247 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2248 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2249 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2250 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; | |
| 2251 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; | |
| 2252 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; | |
| 2253 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2254 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2255 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2; | |
| 2256 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2; | |
| 2257 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2; | |
| 2258 SRC(7,7)= (t14 + 3*t15 + 2) >> 2; | |
| 2259 } | |
| 2260 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2261 { | |
| 2262 PREDICT_8x8_LOAD_TOP; | |
| 2263 PREDICT_8x8_LOAD_LEFT; | |
| 2264 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2265 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2; | |
| 2266 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2267 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2268 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2269 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2270 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2271 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; | |
| 2272 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; | |
| 2273 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; | |
| 2274 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2275 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2276 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2277 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2278 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2279 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2967 | 2280 |
| 2755 | 2281 } |
| 2282 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2283 { | |
| 2284 PREDICT_8x8_LOAD_TOP; | |
| 2285 PREDICT_8x8_LOAD_LEFT; | |
| 2286 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2287 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2288 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2289 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2290 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2291 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2292 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2293 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2294 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1; | |
| 2295 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2296 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1; | |
| 2297 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2298 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1; | |
| 2299 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2300 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1; | |
| 2301 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2302 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1; | |
| 2303 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2304 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1; | |
| 2305 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2306 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1; | |
| 2307 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2308 SRC(7,0)= (t6 + t7 + 1) >> 1; | |
| 2309 } | |
| 2310 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2311 { | |
| 2312 PREDICT_8x8_LOAD_TOP; | |
| 2313 PREDICT_8x8_LOAD_LEFT; | |
| 2314 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2315 SRC(0,7)= (l6 + l7 + 1) >> 1; | |
| 2316 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2317 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1; | |
| 2318 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2319 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1; | |
| 2320 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2321 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1; | |
| 2322 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2323 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1; | |
| 2324 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2325 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1; | |
| 2326 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2327 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1; | |
| 2328 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2; | |
| 2329 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1; | |
| 2330 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2331 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2; | |
| 2332 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2; | |
| 2333 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2; | |
| 2334 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2; | |
| 2335 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2; | |
| 2336 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2; | |
| 2337 } | |
| 2338 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2339 { | |
| 2340 PREDICT_8x8_LOAD_TOP; | |
| 2341 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2342 SRC(0,0)= (t0 + t1 + 1) >> 1; | |
| 2343 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2344 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1; | |
| 2345 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2346 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1; | |
| 2347 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2348 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1; | |
| 2349 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2350 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1; | |
| 2351 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2352 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1; | |
| 2353 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2354 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1; | |
| 2355 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2356 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1; | |
| 2357 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2358 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1; | |
| 2359 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2360 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1; | |
| 2361 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2362 SRC(7,6)= (t10 + t11 + 1) >> 1; | |
| 2363 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2364 } | |
| 2365 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2366 { | |
| 2367 PREDICT_8x8_LOAD_LEFT; | |
| 2368 SRC(0,0)= (l0 + l1 + 1) >> 1; | |
| 2369 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2370 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1; | |
| 2371 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2372 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1; | |
| 2373 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2374 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1; | |
| 2375 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2376 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1; | |
| 2377 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2378 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1; | |
| 2379 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2380 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1; | |
| 2381 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2; | |
| 2382 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)= | |
| 2383 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)= | |
| 2384 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)= | |
| 2385 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7; | |
| 2386 } | |
| 2387 #undef PREDICT_8x8_LOAD_LEFT | |
| 2388 #undef PREDICT_8x8_LOAD_TOP | |
| 2389 #undef PREDICT_8x8_LOAD_TOPLEFT | |
| 2390 #undef PREDICT_8x8_LOAD_TOPRIGHT | |
| 2391 #undef PREDICT_8x8_DC | |
| 2392 #undef PTR | |
| 2393 #undef PT | |
| 2394 #undef PL | |
| 2395 #undef SRC | |
| 2396 | |
| 1168 | 2397 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, |
| 2398 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2399 int src_x_offset, int src_y_offset, | |
| 2400 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 2401 MpegEncContext * const s = &h->s; | |
| 2402 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 3316 | 2403 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; |
| 1168 | 2404 const int luma_xy= (mx&3) + ((my&3)<<2); |
| 3316 | 2405 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize; |
| 2406 uint8_t * src_cb, * src_cr; | |
| 2407 int extra_width= h->emu_edge_width; | |
| 2408 int extra_height= h->emu_edge_height; | |
| 1168 | 2409 int emu=0; |
| 2410 const int full_mx= mx>>2; | |
| 2411 const int full_my= my>>2; | |
|
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2412 const int pic_width = 16*s->mb_width; |
| 3316 | 2413 const int pic_height = 16*s->mb_height >> MB_MBAFF; |
| 2967 | 2414 |
| 4390 | 2415 if(!pic->data[0]) //FIXME this is unacceptable, some senseable error concealment must be done for missing reference frames |
| 3125 | 2416 return; |
| 2967 | 2417 |
| 1168 | 2418 if(mx&7) extra_width -= 3; |
| 2419 if(my&7) extra_height -= 3; | |
| 2967 | 2420 |
| 2421 if( full_mx < 0-extra_width | |
| 2422 || full_my < 0-extra_height | |
| 2423 || full_mx + 16/*FIXME*/ > pic_width + extra_width | |
|
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2424 || full_my + 16/*FIXME*/ > pic_height + extra_height){ |
| 3316 | 2425 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); |
| 2426 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize; | |
| 1168 | 2427 emu=1; |
| 2428 } | |
| 2967 | 2429 |
| 3316 | 2430 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps? |
| 1168 | 2431 if(!square){ |
| 3316 | 2432 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize); |
| 1168 | 2433 } |
| 2967 | 2434 |
| 1168 | 2435 if(s->flags&CODEC_FLAG_GRAY) return; |
| 2967 | 2436 |
| 3316 | 2437 if(MB_MBAFF){ |
| 2438 // chroma offset when predicting from a field of opposite parity | |
| 2439 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1)); | |
| 2440 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); | |
| 2441 } | |
| 2442 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
| 2443 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
| 1168 | 2444 |
| 2445 if(emu){ | |
| 3316 | 2446 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); |
| 2447 src_cb= s->edge_emu_buffer; | |
| 2448 } | |
| 2449 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7); | |
| 2450 | |
| 2451 if(emu){ | |
| 2452 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 | 2453 src_cr= s->edge_emu_buffer; |
| 2454 } | |
| 3316 | 2455 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7); |
| 1168 | 2456 } |
| 2457 | |
| 2415 | 2458 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
| 1168 | 2459 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2460 int x_offset, int y_offset, | |
| 2461 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2462 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2463 int list0, int list1){ | |
| 2464 MpegEncContext * const s = &h->s; | |
| 2465 qpel_mc_func *qpix_op= qpix_put; | |
| 2466 h264_chroma_mc_func chroma_op= chroma_put; | |
| 2967 | 2467 |
| 3316 | 2468 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
| 2469 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
| 2470 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
| 1168 | 2471 x_offset += 8*s->mb_x; |
| 3316 | 2472 y_offset += 8*(s->mb_y >> MB_MBAFF); |
| 2967 | 2473 |
| 1168 | 2474 if(list0){ |
| 1169 | 2475 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 2476 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 2477 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2478 qpix_op, chroma_op); | |
| 2479 | |
| 2480 qpix_op= qpix_avg; | |
| 2481 chroma_op= chroma_avg; | |
| 2482 } | |
| 2483 | |
| 2484 if(list1){ | |
| 1169 | 2485 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 2486 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 2487 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2488 qpix_op, chroma_op); | |
| 2489 } | |
| 2490 } | |
| 2491 | |
| 2415 | 2492 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
| 2493 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2494 int x_offset, int y_offset, | |
| 2495 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2496 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
| 2497 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
| 2498 int list0, int list1){ | |
| 2499 MpegEncContext * const s = &h->s; | |
| 2500 | |
| 3316 | 2501 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
| 2502 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
| 2503 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
| 2415 | 2504 x_offset += 8*s->mb_x; |
| 3316 | 2505 y_offset += 8*(s->mb_y >> MB_MBAFF); |
| 2967 | 2506 |
| 2415 | 2507 if(list0 && list1){ |
| 2508 /* don't optimize for luma-only case, since B-frames usually | |
| 2509 * use implicit weights => chroma too. */ | |
| 2510 uint8_t *tmp_cb = s->obmc_scratchpad; | |
| 3316 | 2511 uint8_t *tmp_cr = s->obmc_scratchpad + 8; |
| 2512 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize; | |
| 2415 | 2513 int refn0 = h->ref_cache[0][ scan8[n] ]; |
| 2514 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
| 2515 | |
| 2516 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
| 2517 dest_y, dest_cb, dest_cr, | |
| 2518 x_offset, y_offset, qpix_put, chroma_put); | |
| 2519 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
| 2520 tmp_y, tmp_cb, tmp_cr, | |
| 2521 x_offset, y_offset, qpix_put, chroma_put); | |
| 2522 | |
| 2523 if(h->use_weight == 2){ | |
| 2524 int weight0 = h->implicit_weight[refn0][refn1]; | |
| 2525 int weight1 = 64 - weight0; | |
| 3316 | 2526 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0); |
| 2527 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
| 2528 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
| 2415 | 2529 }else{ |
| 3316 | 2530 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom, |
| 2967 | 2531 h->luma_weight[0][refn0], h->luma_weight[1][refn1], |
| 3029 | 2532 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]); |
| 3316 | 2533 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2967 | 2534 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], |
| 3029 | 2535 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]); |
| 3316 | 2536 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2967 | 2537 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], |
| 3029 | 2538 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]); |
| 2415 | 2539 } |
| 2540 }else{ | |
| 2541 int list = list1 ? 1 : 0; | |
| 2542 int refn = h->ref_cache[list][ scan8[n] ]; | |
| 2543 Picture *ref= &h->ref_list[list][refn]; | |
| 2544 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
| 2545 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2546 qpix_put, chroma_put); | |
| 2547 | |
| 3316 | 2548 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom, |
| 2415 | 2549 h->luma_weight[list][refn], h->luma_offset[list][refn]); |
| 2550 if(h->use_weight_chroma){ | |
| 3316 | 2551 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2415 | 2552 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); |
| 3316 | 2553 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
| 2415 | 2554 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); |
| 2555 } | |
| 2556 } | |
| 2557 } | |
| 2558 | |
| 2559 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 2560 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2561 int x_offset, int y_offset, | |
| 2562 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2563 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2967 | 2564 h264_weight_func *weight_op, h264_biweight_func *weight_avg, |
| 2415 | 2565 int list0, int list1){ |
| 2566 if((h->use_weight==2 && list0 && list1 | |
| 2567 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
| 2568 || h->use_weight==1) | |
| 2569 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2570 x_offset, y_offset, qpix_put, chroma_put, | |
| 2571 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
| 2572 else | |
| 2573 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2574 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
| 2575 } | |
| 2576 | |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2577 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
|
2578 /* fetch pixels for estimated mv 4 macroblocks ahead |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2579 * optimized for 64byte cache lines */ |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2580 MpegEncContext * const s = &h->s; |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2581 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
|
2582 if(refn >= 0){ |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2583 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
|
2584 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
|
2585 uint8_t **src= h->ref_list[list][refn].data; |
| 3316 | 2586 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
|
2587 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
|
2588 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
|
2589 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
|
2590 } |
|
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 |
| 1168 | 2593 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2594 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2415 | 2595 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
| 2596 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
| 1168 | 2597 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
|
2598 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2599 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2967 | 2600 |
| 1168 | 2601 assert(IS_INTER(mb_type)); |
| 2967 | 2602 |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2603 prefetch_motion(h, 0); |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2604 |
| 1168 | 2605 if(IS_16X16(mb_type)){ |
| 2606 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2607 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2415 | 2608 &weight_op[0], &weight_avg[0], |
| 1168 | 2609 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2610 }else if(IS_16X8(mb_type)){ | |
| 2611 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2612 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2613 &weight_op[1], &weight_avg[1], |
| 1168 | 2614 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2615 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 2616 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2617 &weight_op[1], &weight_avg[1], |
| 1168 | 2618 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2619 }else if(IS_8X16(mb_type)){ | |
| 3316 | 2620 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, |
| 1168 | 2621 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
| 2415 | 2622 &weight_op[2], &weight_avg[2], |
| 1168 | 2623 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 3316 | 2624 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, |
| 1168 | 2625 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
| 2415 | 2626 &weight_op[2], &weight_avg[2], |
| 1168 | 2627 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2628 }else{ | |
| 2629 int i; | |
| 2967 | 2630 |
| 1168 | 2631 assert(IS_8X8(mb_type)); |
| 2632 | |
| 2633 for(i=0; i<4; i++){ | |
| 2634 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2635 const int n= 4*i; | |
| 2636 int x_offset= (i&1)<<2; | |
| 2637 int y_offset= (i&2)<<1; | |
| 2638 | |
| 2639 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2640 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2641 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2642 &weight_op[3], &weight_avg[3], |
| 1168 | 2643 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2644 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2645 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2646 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2647 &weight_op[4], &weight_avg[4], |
| 1168 | 2648 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2649 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 2650 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2651 &weight_op[4], &weight_avg[4], |
| 1168 | 2652 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2653 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 3316 | 2654 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, |
| 1168 | 2655 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
| 2415 | 2656 &weight_op[5], &weight_avg[5], |
| 1168 | 2657 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 3316 | 2658 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, |
| 1168 | 2659 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
| 2415 | 2660 &weight_op[5], &weight_avg[5], |
| 1168 | 2661 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2662 }else{ | |
| 2663 int j; | |
| 2664 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2665 for(j=0; j<4; j++){ | |
| 2666 int sub_x_offset= x_offset + 2*(j&1); | |
| 2667 int sub_y_offset= y_offset + (j&2); | |
| 2668 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2669 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2670 &weight_op[6], &weight_avg[6], |
| 1168 | 2671 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2672 } | |
| 2673 } | |
| 2674 } | |
| 2675 } | |
|
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2676 |
|
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
2677 prefetch_motion(h, 1); |
| 1168 | 2678 } |
| 2679 | |
|
4783
011fb289e3b0
changes some function declarations from () to (void) as per ansi c.
gpoirier
parents:
4745
diff
changeset
|
2680 static void decode_init_vlc(void){ |
| 1168 | 2681 static int done = 0; |
| 2682 | |
| 2683 if (!done) { | |
| 2684 int i; | |
| 2685 done = 1; | |
| 2686 | |
| 2967 | 2687 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, |
| 1168 | 2688 &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
|
2689 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
| 1168 | 2690 |
| 2691 for(i=0; i<4; i++){ | |
| 2967 | 2692 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, |
| 1168 | 2693 &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
|
2694 &coeff_token_bits[i][0], 1, 1, 1); |
| 1168 | 2695 } |
| 2696 | |
| 2697 for(i=0; i<3; i++){ | |
| 2698 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2699 &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
|
2700 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2701 } |
| 2702 for(i=0; i<15; i++){ | |
| 2967 | 2703 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, |
| 1168 | 2704 &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
|
2705 &total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2706 } |
| 2707 | |
| 2708 for(i=0; i<6; i++){ | |
| 2967 | 2709 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, |
| 1168 | 2710 &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
|
2711 &run_bits[i][0], 1, 1, 1); |
| 1168 | 2712 } |
| 2967 | 2713 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, |
| 1168 | 2714 &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
|
2715 &run_bits[6][0], 1, 1, 1); |
| 1168 | 2716 } |
| 2717 } | |
| 2718 | |
| 2719 /** | |
| 2720 * Sets the intra prediction function pointers. | |
| 2721 */ | |
| 2722 static void init_pred_ptrs(H264Context *h){ | |
| 2723 // MpegEncContext * const s = &h->s; | |
| 2724 | |
| 2725 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2726 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2727 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2728 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2729 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2730 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2731 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2732 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2733 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2734 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2735 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2736 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2737 | |
| 2755 | 2738 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
| 2739 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; | |
| 2740 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; | |
| 2741 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; | |
| 2742 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; | |
| 2743 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; | |
| 2744 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; | |
| 2745 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; | |
| 2746 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; | |
| 2747 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; | |
| 2748 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; | |
| 2749 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; | |
| 2750 | |
|
4271
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2751 h->pred8x8[DC_PRED8x8 ]= ff_pred8x8_dc_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2752 h->pred8x8[VERT_PRED8x8 ]= ff_pred8x8_vertical_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2753 h->pred8x8[HOR_PRED8x8 ]= ff_pred8x8_horizontal_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2754 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
|
2755 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
|
2756 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
|
2757 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
|
2758 |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2759 h->pred16x16[DC_PRED8x8 ]= ff_pred16x16_dc_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2760 h->pred16x16[VERT_PRED8x8 ]= ff_pred16x16_vertical_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2761 h->pred16x16[HOR_PRED8x8 ]= ff_pred16x16_horizontal_c; |
|
8cb3d28d7e40
Export symbols of several H.264 intra prediction functions
takis
parents:
4270
diff
changeset
|
2762 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
|
2763 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
|
2764 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
|
2765 h->pred16x16[DC_128_PRED8x8 ]= ff_pred16x16_128_dc_c; |
| 1168 | 2766 } |
| 2767 | |
| 2768 static void free_tables(H264Context *h){ | |
| 5079 | 2769 int i; |
| 1168 | 2770 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
|
2771 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
|
2772 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
|
2773 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
|
2774 av_freep(&h->mvd_table[1]); |
| 2396 | 2775 av_freep(&h->direct_table); |
| 1168 | 2776 av_freep(&h->non_zero_count); |
| 2777 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
|
2778 av_freep(&h->top_borders[1]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2779 av_freep(&h->top_borders[0]); |
| 1168 | 2780 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
|
2781 |
| 1168 | 2782 av_freep(&h->mb2b_xy); |
| 2783 av_freep(&h->mb2b8_xy); | |
| 2415 | 2784 |
| 2785 av_freep(&h->s.obmc_scratchpad); | |
| 5079 | 2786 |
| 2787 for(i = 0; i < MAX_SPS_COUNT; i++) | |
| 2788 av_freep(h->sps_buffers + i); | |
| 2789 | |
| 2790 for(i = 0; i < MAX_PPS_COUNT; i++) | |
| 2791 av_freep(h->pps_buffers + i); | |
| 1168 | 2792 } |
| 2793 | |
| 2919 | 2794 static void init_dequant8_coeff_table(H264Context *h){ |
| 2795 int i,q,x; | |
| 3174 | 2796 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly |
| 2919 | 2797 h->dequant8_coeff[0] = h->dequant8_buffer[0]; |
| 2798 h->dequant8_coeff[1] = h->dequant8_buffer[1]; | |
| 2799 | |
| 2800 for(i=0; i<2; i++ ){ | |
| 2801 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){ | |
| 2802 h->dequant8_coeff[1] = h->dequant8_buffer[0]; | |
| 2803 break; | |
| 2804 } | |
| 2805 | |
| 2806 for(q=0; q<52; q++){ | |
|
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2807 int shift = ff_div6[q]; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2808 int idx = ff_rem6[q]; |
| 2919 | 2809 for(x=0; x<64; x++) |
| 3174 | 2810 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = |
| 2811 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * | |
| 2812 h->pps.scaling_matrix8[i][x]) << shift; | |
| 2919 | 2813 } |
| 2814 } | |
| 2815 } | |
| 2816 | |
| 2817 static void init_dequant4_coeff_table(H264Context *h){ | |
| 2818 int i,j,q,x; | |
| 3005 | 2819 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly |
| 2919 | 2820 for(i=0; i<6; i++ ){ |
| 2821 h->dequant4_coeff[i] = h->dequant4_buffer[i]; | |
| 2822 for(j=0; j<i; j++){ | |
| 2823 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){ | |
| 2824 h->dequant4_coeff[i] = h->dequant4_buffer[j]; | |
| 2825 break; | |
| 2826 } | |
| 2827 } | |
| 2828 if(j<i) | |
| 2829 continue; | |
| 2830 | |
| 2831 for(q=0; q<52; q++){ | |
|
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2832 int shift = ff_div6[q] + 2; |
|
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2833 int idx = ff_rem6[q]; |
| 2919 | 2834 for(x=0; x<16; x++) |
| 3005 | 2835 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = |
| 2836 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * | |
| 2919 | 2837 h->pps.scaling_matrix4[i][x]) << shift; |
| 2838 } | |
| 2839 } | |
| 2840 } | |
| 2841 | |
| 2842 static void init_dequant_tables(H264Context *h){ | |
| 2843 int i,x; | |
| 2844 init_dequant4_coeff_table(h); | |
| 2845 if(h->pps.transform_8x8_mode) | |
| 2846 init_dequant8_coeff_table(h); | |
| 2847 if(h->sps.transform_bypass){ | |
| 2848 for(i=0; i<6; i++) | |
| 2849 for(x=0; x<16; x++) | |
| 2850 h->dequant4_coeff[i][0][x] = 1<<6; | |
| 2851 if(h->pps.transform_8x8_mode) | |
| 2852 for(i=0; i<2; i++) | |
| 2853 for(x=0; x<64; x++) | |
| 2854 h->dequant8_coeff[i][0][x] = 1<<6; | |
| 2855 } | |
| 2856 } | |
| 2857 | |
| 2858 | |
| 1168 | 2859 /** |
| 2860 * allocates tables. | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2861 * needs width/height |
| 1168 | 2862 */ |
| 2863 static int alloc_tables(H264Context *h){ | |
| 2864 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
|
2865 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 2919 | 2866 int x,y; |
| 1168 | 2867 |
| 2868 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
|
2869 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2870 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 3316 | 2871 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
|
2872 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
|
2873 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 2336 | 2874 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
| 1168 | 2875 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2876 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
|
2877 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
|
2878 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
|
2879 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
| 2396 | 2880 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
|
2881 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2882 |
| 3316 | 2883 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t)); |
| 2884 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; | |
| 1168 | 2885 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2886 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
|
2887 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
| 1168 | 2888 for(y=0; y<s->mb_height; y++){ |
| 2889 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
|
2890 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2891 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2892 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2967 | 2893 |
| 1168 | 2894 h->mb2b_xy [mb_xy]= b_xy; |
| 2895 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2896 } | |
| 2897 } | |
| 2415 | 2898 |
| 2417 | 2899 s->obmc_scratchpad = NULL; |
| 2900 | |
| 2920 | 2901 if(!h->dequant4_coeff[0]) |
| 2902 init_dequant_tables(h); | |
| 2903 | |
| 1168 | 2904 return 0; |
| 2905 fail: | |
| 2906 free_tables(h); | |
| 2907 return -1; | |
| 2908 } | |
| 2909 | |
| 2910 static void common_init(H264Context *h){ | |
| 2911 MpegEncContext * const s = &h->s; | |
| 2912 | |
| 2913 s->width = s->avctx->width; | |
| 2914 s->height = s->avctx->height; | |
| 2915 s->codec_id= s->avctx->codec->id; | |
| 2967 | 2916 |
| 1168 | 2917 init_pred_ptrs(h); |
| 2918 | |
| 2919 | 2919 h->dequant_coeff_pps= -1; |
| 1698 | 2920 s->unrestricted_mv=1; |
| 1168 | 2921 s->decode=1; //FIXME |
| 2920 | 2922 |
| 2923 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t)); | |
| 2924 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
| 1168 | 2925 } |
| 2926 | |
| 2927 static int decode_init(AVCodecContext *avctx){ | |
| 2928 H264Context *h= avctx->priv_data; | |
| 2929 MpegEncContext * const s = &h->s; | |
| 2930 | |
| 1892 | 2931 MPV_decode_defaults(s); |
| 2967 | 2932 |
| 1168 | 2933 s->avctx = avctx; |
| 2934 common_init(h); | |
| 2935 | |
| 2936 s->out_format = FMT_H264; | |
| 2937 s->workaround_bugs= avctx->workaround_bugs; | |
| 2938 | |
| 2939 // set defaults | |
| 2940 // s->decode_mb= ff_h263_decode_mb; | |
| 2941 s->low_delay= 1; | |
| 2942 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 2943 | |
|
4164
171e768324cd
Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents:
4118
diff
changeset
|
2944 decode_init_vlc(); |
| 2967 | 2945 |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2946 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
|
2947 *(char *)avctx->extradata == 1){ |
| 2227 | 2948 h->is_avc = 1; |
| 2949 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
|
2950 } else { |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2951 h->is_avc = 0; |
| 2227 | 2952 } |
| 2953 | |
| 1168 | 2954 return 0; |
| 2955 } | |
| 2956 | |
| 2935 | 2957 static int frame_start(H264Context *h){ |
| 1168 | 2958 MpegEncContext * const s = &h->s; |
| 2959 int i; | |
| 2960 | |
| 2935 | 2961 if(MPV_frame_start(s, s->avctx) < 0) |
| 2962 return -1; | |
| 1168 | 2963 ff_er_frame_start(s); |
| 2964 | |
| 2965 assert(s->linesize && s->uvlinesize); | |
| 2966 | |
| 2967 for(i=0; i<16; i++){ | |
| 2968 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
|
2969 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2970 } |
| 2971 for(i=0; i<4; i++){ | |
| 2972 h->block_offset[16+i]= | |
| 2973 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
|
2974 h->block_offset[24+16+i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2975 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2976 } |
| 2977 | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2978 /* 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
|
2979 * 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
|
2980 if(!s->obmc_scratchpad) |
| 3316 | 2981 s->obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize); |
| 2982 | |
| 2983 /* some macroblocks will be accessed before they're available */ | |
| 2984 if(FRAME_MBAFF) | |
| 2985 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
|
2986 |
| 1168 | 2987 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
| 2935 | 2988 return 0; |
| 1168 | 2989 } |
| 2990 | |
| 5106 | 2991 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
|
2992 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
|
2993 int i; |
| 2967 | 2994 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2995 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
|
2996 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
|
2997 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
|
2998 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2999 // 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
|
3000 // 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
|
3001 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
|
3002 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
|
3003 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
|
3004 } |
| 2967 | 3005 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3006 *(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
|
3007 *(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
|
3008 |
| 5106 | 3009 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
|
3010 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
|
3011 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
|
3012 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
|
3013 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
|
3014 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
|
3015 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3016 *(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
|
3017 *(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
|
3018 } |
|
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 |
| 5106 | 3021 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
|
3022 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
|
3023 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
|
3024 uint64_t temp64; |
|
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3025 int deblock_left; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3026 int deblock_top; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3027 int mb_xy; |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3028 |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3029 if(h->deblocking_filter == 2) { |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3030 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
|
3031 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
|
3032 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
|
3033 } else { |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3034 deblock_left = (s->mb_x > 0); |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3035 deblock_top = (s->mb_y > 0); |
|
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
3036 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3037 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3038 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
|
3039 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
|
3040 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
|
3041 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3042 #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
|
3043 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3044 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3045 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3046 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3047 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3048 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3049 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
|
3050 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
|
3051 } |
|
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 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3055 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
|
3056 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
| 2803 | 3057 if(s->mb_x+1 < s->mb_width){ |
| 2755 | 3058 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); |
| 3059 } | |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3060 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3061 |
| 5106 | 3062 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
|
3063 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3064 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
|
3065 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
|
3066 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
|
3067 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3068 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3069 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3070 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
|
3071 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
|
3072 } |
|
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 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
|
3077 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3078 int i; |
| 2967 | 3079 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3080 src_y -= 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3081 src_cb -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3082 src_cr -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3083 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3084 // 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
|
3085 // 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
|
3086 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
|
3087 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
|
3088 for(i=2; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3089 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
|
3090 } |
| 2967 | 3091 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3092 *(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
|
3093 *(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
|
3094 *(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
|
3095 *(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
|
3096 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3097 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3098 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
|
3099 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
|
3100 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
|
3101 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
|
3102 for(i=2; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3103 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
|
3104 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
|
3105 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3106 *(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
|
3107 *(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
|
3108 *(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
|
3109 *(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
|
3110 } |
|
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 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
|
3114 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3115 int temp8, i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3116 uint64_t temp64; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3117 int deblock_left = (s->mb_x > 0); |
| 3316 | 3118 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
|
3119 |
| 4600 | 3120 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
|
3121 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3122 src_y -= 2 * linesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3123 src_cb -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3124 src_cr -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3125 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3126 #define XCHG(a,b,t,xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3127 t= a;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3128 if(xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3129 a= b;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3130 b= t; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3131 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3132 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3133 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
|
3134 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
|
3135 } |
|
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 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3139 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
|
3140 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
|
3141 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
|
3142 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1); |
| 3316 | 3143 if(s->mb_x+1 < s->mb_width){ |
| 3144 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
| 3145 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1); | |
| 3146 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3147 } |
|
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 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3150 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3151 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
|
3152 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
|
3153 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
|
3154 } |
|
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 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3157 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
|
3158 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
|
3159 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
|
3160 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
|
3161 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3162 } |
|
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 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
3165 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ |
| 1168 | 3166 MpegEncContext * const s = &h->s; |
| 3167 const int mb_x= s->mb_x; | |
| 3168 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
|
3169 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 3170 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 3171 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 3172 int linesize, uvlinesize /*dct_offset*/; | |
| 3173 int i; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3174 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
|
3175 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
|
3176 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass), is_h264 = (simple || s->codec_id == CODEC_ID_H264); |
| 2763 | 3177 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
|
3178 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride); |
| 1168 | 3179 |
| 3180 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 3181 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3182 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3183 | |
| 4000 | 3184 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4); |
| 3185 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2); | |
| 3186 | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3187 if (!simple && MB_FIELD) { |
| 3316 | 3188 linesize = h->mb_linesize = s->linesize * 2; |
| 3189 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
|
3190 block_offset = &h->block_offset[24]; |
| 1168 | 3191 if(mb_y&1){ //FIXME move out of this func? |
| 3192 dest_y -= s->linesize*15; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3193 dest_cb-= s->uvlinesize*7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3194 dest_cr-= s->uvlinesize*7; |
| 1168 | 3195 } |
| 3316 | 3196 if(FRAME_MBAFF) { |
| 3197 int list; | |
| 4533 | 3198 for(list=0; list<h->list_count; list++){ |
| 3316 | 3199 if(!USES_LIST(mb_type, list)) |
| 3200 continue; | |
| 3201 if(IS_16X16(mb_type)){ | |
| 3202 int8_t *ref = &h->ref_cache[list][scan8[0]]; | |
| 3203 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1); | |
| 3204 }else{ | |
| 3205 for(i=0; i<16; i+=4){ | |
| 3206 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ? | |
| 3207 int ref = h->ref_cache[list][scan8[i]]; | |
| 3208 if(ref >= 0) | |
| 3209 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1); | |
| 3210 } | |
| 3211 } | |
| 3212 } | |
| 3213 } | |
| 1168 | 3214 } else { |
| 3316 | 3215 linesize = h->mb_linesize = s->linesize; |
| 3216 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
| 1168 | 3217 // dct_offset = s->linesize * 16; |
| 3218 } | |
| 2967 | 3219 |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3220 if(transform_bypass){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3221 idct_dc_add = |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3222 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
|
3223 }else if(IS_8x8DCT(mb_type)){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3224 idct_dc_add = s->dsp.h264_idct8_dc_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3225 idct_add = s->dsp.h264_idct8_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3226 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3227 idct_dc_add = s->dsp.h264_idct_dc_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3228 idct_add = s->dsp.h264_idct_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3229 } |
| 1168 | 3230 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3231 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type) |
| 3316 | 3232 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){ |
| 3233 int mbt_y = mb_y&~1; | |
| 3234 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16; | |
| 3235 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3236 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3237 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1); | |
| 3238 } | |
| 3239 | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3240 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
|
3241 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3242 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3243 // 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
|
3244 // 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
|
3245 for(i=0; i<16; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3246 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3247 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
|
3248 *(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
|
3249 } |
|
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 for(i=16; i<16+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3253 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3254 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
|
3255 *(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
|
3256 } |
|
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 for(i=20; i<20+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3260 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3261 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
|
3262 *(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
|
3263 } |
|
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 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3266 } else { |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3267 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
|
3268 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
| 5106 | 3269 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
|
3270 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3271 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
|
3272 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
|
3273 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
|
3274 } |
|
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 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
|
3277 if(simple || !s->encoding){ |
| 2755 | 3278 if(IS_8x8DCT(mb_type)){ |
| 3279 for(i=0; i<16; i+=4){ | |
| 3280 uint8_t * const ptr= dest_y + block_offset[i]; | |
| 3281 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
|
3282 const int nnz = h->non_zero_count_cache[ scan8[i] ]; |
| 2755 | 3283 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, |
| 4546 | 3284 (h->topright_samples_available<<i)&0x4000, linesize); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3285 if(nnz){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3286 if(nnz == 1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3287 idct_dc_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3288 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3289 idct_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3290 } |
| 2755 | 3291 } |
| 3292 }else | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3293 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
|
3294 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
|
3295 uint8_t *topright; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3296 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
|
3297 int nnz, tr; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3298 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3299 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
|
3300 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
|
3301 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
|
3302 if(!topright_avail){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3303 tr= ptr[3 - linesize]*0x01010101; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3304 topright= (uint8_t*) &tr; |
| 2967 | 3305 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3306 topright= ptr + 4 - linesize; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3307 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3308 topright= NULL; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3309 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3310 h->pred4x4[ dir ](ptr, topright, linesize); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3311 nnz = h->non_zero_count_cache[ scan8[i] ]; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3312 if(nnz){ |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3313 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3314 if(nnz == 1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3315 idct_dc_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3316 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3317 idct_add(ptr, h->mb + i*16, linesize); |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3318 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3319 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
|
3320 } |
|
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 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3324 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
|
3325 if(is_h264){ |
| 2763 | 3326 if(!transform_bypass) |
| 2919 | 3327 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[IS_INTRA(mb_type) ? 0:3][s->qscale][0]); |
| 2763 | 3328 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3329 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
|
3330 } |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3331 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
| 5106 | 3332 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
|
3333 }else if(is_h264){ |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3334 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
|
3335 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
|
3336 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
|
3337 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
|
3338 } |
|
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 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
|
3342 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3343 if(IS_INTRA16x16(mb_type)){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3344 for(i=0; i<16; i++){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3345 if(h->non_zero_count_cache[ scan8[i] ]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3346 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
|
3347 else if(h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3348 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
|
3349 } |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3350 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3351 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3352 for(i=0; i<16; i+=di){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3353 int nnz = h->non_zero_count_cache[ scan8[i] ]; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3354 if(nnz){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3355 if(nnz==1 && h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3356 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
|
3357 else |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3358 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
|
3359 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3360 } |
|
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 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3363 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
|
3364 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
|
3365 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
|
3366 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1234 | 3367 } |
| 1168 | 3368 } |
| 3369 } | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3370 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3371 |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3372 if(simple || !(s->flags&CODEC_FLAG_GRAY)){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3373 uint8_t *dest[2] = {dest_cb, dest_cr}; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3374 if(transform_bypass){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3375 idct_add = idct_dc_add = s->dsp.add_pixels4; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3376 }else{ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3377 idct_add = s->dsp.h264_idct_add; |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3378 idct_dc_add = s->dsp.h264_idct_dc_add; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3379 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp[0], h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3380 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]); |
| 2763 | 3381 } |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3382 if(is_h264){ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3383 for(i=16; i<16+8; i++){ |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3384 if(h->non_zero_count_cache[ scan8[i] ]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3385 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
|
3386 else if(h->mb[i*16]) |
|
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3387 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
|
3388 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3389 }else{ |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3390 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
|
3391 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
|
3392 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
|
3393 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
|
3394 } |
| 1250 | 3395 } |
| 1168 | 3396 } |
| 3397 } | |
| 3398 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3399 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
|
3400 if (!simple && FRAME_MBAFF) { |
| 3316 | 3401 //FIXME try deblocking one mb at a time? |
| 3402 // 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
|
3403 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
|
3404 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
|
3405 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
|
3406 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
|
3407 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
|
3408 if (!bottom) return; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3409 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
|
3410 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
|
3411 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
|
3412 |
| 3316 | 3413 if(IS_INTRA(mb_type_top | mb_type_bottom)) |
| 3414 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0); | |
| 3415 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3416 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize); |
| 3316 | 3417 // deblock a pair |
| 2967 | 3418 // top |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3419 s->mb_y--; |
| 4600 | 3420 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
|
3421 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3422 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3423 h->chroma_qp[1] = get_chroma_qp(h, 1, 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 |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3429 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy+s->mb_stride]); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
3430 h->chroma_qp[1] = get_chroma_qp(h, 1, 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
|
3431 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
|
3432 } else { |
| 4600 | 3433 tprintf(h->s.avctx, "call filter_mb\n"); |
| 5106 | 3434 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
|
3435 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
|
3436 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
|
3437 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3438 } |
| 1168 | 3439 } |
| 3440 | |
| 3441 /** | |
|
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3442 * 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
|
3443 */ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3444 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
|
3445 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
|
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 /** |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3449 * 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
|
3450 */ |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3451 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
|
3452 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
|
3453 } |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3454 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3455 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
|
3456 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
|
3457 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
|
3458 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
|
3459 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
|
3460 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
|
3461 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
|
3462 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3463 if(!s->decode) |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3464 return; |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3465 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3466 if (is_complex) |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3467 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
|
3468 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
|
3469 } |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3470 |
|
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
3471 /** |
| 1168 | 3472 * fills the default_ref_list. |
| 3473 */ | |
| 3474 static int fill_default_ref_list(H264Context *h){ | |
| 3475 MpegEncContext * const s = &h->s; | |
| 3476 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
|
3477 int smallest_poc_greater_than_current = -1; |
| 2582 | 3478 Picture sorted_short_ref[32]; |
| 2967 | 3479 |
| 1168 | 3480 if(h->slice_type==B_TYPE){ |
| 3481 int out_i; | |
| 2713 | 3482 int limit= INT_MIN; |
| 1168 | 3483 |
|
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
|
3484 /* sort frame according to poc in B slice */ |
| 1168 | 3485 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
| 2713 | 3486 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
|
3487 int best_poc=INT_MAX; |
| 1168 | 3488 |
| 3489 for(i=0; i<h->short_ref_count; i++){ | |
| 3490 const int poc= h->short_ref[i]->poc; | |
| 3491 if(poc > limit && poc < best_poc){ | |
| 3492 best_poc= poc; | |
| 3493 best_i= i; | |
| 3494 } | |
| 3495 } | |
| 2967 | 3496 |
| 2713 | 3497 assert(best_i != INT_MIN); |
| 2967 | 3498 |
| 1168 | 3499 limit= best_poc; |
| 3500 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
| 4600 | 3501 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
|
3502 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
|
3503 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
|
3504 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
|
3505 } |
|
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
|
3506 } |
| 1168 | 3507 } |
| 3508 } | |
| 3509 | |
| 3510 if(s->picture_structure == PICT_FRAME){ | |
| 3511 if(h->slice_type==B_TYPE){ | |
| 3512 int list; | |
| 4600 | 3513 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
|
3514 |
|
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
|
3515 // find the largest poc |
| 1168 | 3516 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
|
3517 int index = 0; |
| 2447 | 3518 int j= -99; |
| 3519 int step= list ? -1 : 1; | |
| 3520 | |
| 3521 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
| 3522 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
|
3523 if(j != -99 && step == (list ? -1 : 1)) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3524 return -1; |
| 2447 | 3525 step = -step; |
| 3526 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
|
3527 } |
| 2447 | 3528 if(sorted_short_ref[j].reference != 3) continue; |
| 3529 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
| 3530 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
| 1168 | 3531 } |
| 3532 | |
|
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
|
3533 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
|
3534 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3535 if(h->long_ref[i]->reference != 3) continue; |
| 3536 | |
| 3537 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 3538 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 3539 } | |
| 2967 | 3540 |
| 2447 | 3541 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
|
3542 // 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
|
3543 // L0 and L1 are identical |
| 1168 | 3544 Picture temp= h->default_ref_list[1][0]; |
| 3545 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 2673 | 3546 h->default_ref_list[1][1] = temp; |
| 1168 | 3547 } |
| 3548 | |
| 3549 if(index < h->ref_count[ list ]) | |
| 3550 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 3551 } | |
| 3552 }else{ | |
| 3553 int index=0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3554 for(i=0; i<h->short_ref_count; i++){ |
| 1168 | 3555 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
| 3556 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 3557 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 3558 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3559 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
|
3560 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3561 if(h->long_ref[i]->reference != 3) continue; |
| 3562 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 3563 h->default_ref_list[0][index++].pic_id= i;; | |
| 3564 } | |
| 3565 if(index < h->ref_count[0]) | |
| 3566 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 3567 } | |
| 3568 }else{ //FIELD | |
| 3569 if(h->slice_type==B_TYPE){ | |
| 3570 }else{ | |
| 3571 //FIXME second field balh | |
| 3572 } | |
| 3573 } | |
|
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
|
3574 #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
|
3575 for (i=0; i<h->ref_count[0]; i++) { |
| 4600 | 3576 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
|
3577 } |
|
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 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
|
3579 for (i=0; i<h->ref_count[1]; i++) { |
| 4600 | 3580 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
|
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 } |
|
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
|
3583 #endif |
| 1168 | 3584 return 0; |
| 3585 } | |
| 3586 | |
|
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
|
3587 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
|
3588 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
|
3589 |
| 1168 | 3590 static int decode_ref_pic_list_reordering(H264Context *h){ |
| 3591 MpegEncContext * const s = &h->s; | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3592 int list, index; |
| 2967 | 3593 |
|
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
|
3594 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
|
3595 print_long_term(h); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3596 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func |
| 2967 | 3597 |
| 4533 | 3598 for(list=0; list<h->list_count; list++){ |
| 1168 | 3599 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); |
| 3600 | |
| 3601 if(get_bits1(&s->gb)){ | |
| 3602 int pred= h->curr_pic_num; | |
| 3603 | |
| 3604 for(index=0; ; index++){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3605 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
|
3606 unsigned int pic_id; |
| 1168 | 3607 int i; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3608 Picture *ref = NULL; |
| 2967 | 3609 |
| 3610 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
|
3611 break; |
| 2967 | 3612 |
| 1168 | 3613 if(index >= h->ref_count[list]){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3614 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 3615 return -1; |
| 3616 } | |
| 2967 | 3617 |
| 1168 | 3618 if(reordering_of_pic_nums_idc<3){ |
| 3619 if(reordering_of_pic_nums_idc<2){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3620 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; |
| 1168 | 3621 |
| 3622 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
|
3623 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 3624 return -1; |
| 3625 } | |
| 3626 | |
| 3627 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 3628 else pred+= abs_diff_pic_num; | |
| 3629 pred &= h->max_pic_num - 1; | |
| 2967 | 3630 |
| 2683 | 3631 for(i= h->short_ref_count-1; i>=0; i--){ |
| 3632 ref = h->short_ref[i]; | |
| 3633 assert(ref->reference == 3); | |
| 3634 assert(!ref->long_ref); | |
| 3635 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer | |
| 1168 | 3636 break; |
| 3637 } | |
| 2683 | 3638 if(i>=0) |
| 3639 ref->pic_id= ref->frame_num; | |
| 1168 | 3640 }else{ |
| 3641 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
|
3642 if(pic_id>31){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3643 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
|
3644 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3645 } |
| 2683 | 3646 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
|
3647 if(ref){ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3648 ref->pic_id= pic_id; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3649 assert(ref->reference == 3); |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3650 assert(ref->long_ref); |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3651 i=0; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3652 }else{ |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3653 i=-1; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3654 } |
| 1168 | 3655 } |
| 3656 | |
|
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3657 if (i < 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3658 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 3659 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
| 2683 | 3660 } else { |
| 3661 for(i=index; i+1<h->ref_count[list]; i++){ | |
| 3662 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
| 3663 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
|
3664 } |
|
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 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
|
3666 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
|
3667 } |
| 2683 | 3668 h->ref_list[list][index]= *ref; |
| 1168 | 3669 } |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3670 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3671 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 3672 return -1; |
| 3673 } | |
| 3674 } | |
| 3675 } | |
| 4533 | 3676 } |
| 3677 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
|
3678 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
|
3679 if(!h->ref_list[list][index].data[0]) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3680 h->ref_list[list][index]= s->current_picture; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3681 } |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3682 } |
| 2967 | 3683 |
| 2396 | 3684 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) |
| 3685 direct_dist_scale_factor(h); | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3686 direct_ref_list_init(h); |
| 2967 | 3687 return 0; |
| 1168 | 3688 } |
| 3689 | |
|
3379
69901769c811
fill_mbaff_ref_list is missing a return statement, its return value
mru
parents:
3341
diff
changeset
|
3690 static void fill_mbaff_ref_list(H264Context *h){ |
| 3316 | 3691 int list, i, j; |
| 4533 | 3692 for(list=0; list<2; list++){ //FIXME try list_count |
| 3316 | 3693 for(i=0; i<h->ref_count[list]; i++){ |
| 3694 Picture *frame = &h->ref_list[list][i]; | |
| 3695 Picture *field = &h->ref_list[list][16+2*i]; | |
| 3696 field[0] = *frame; | |
| 3697 for(j=0; j<3; j++) | |
| 3698 field[0].linesize[j] <<= 1; | |
| 3699 field[1] = field[0]; | |
| 3700 for(j=0; j<3; j++) | |
| 3701 field[1].data[j] += frame->linesize[j]; | |
| 3702 | |
| 3703 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i]; | |
| 3704 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i]; | |
| 3705 for(j=0; j<2; j++){ | |
| 3706 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j]; | |
| 3707 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j]; | |
| 3708 } | |
| 3709 } | |
| 3710 } | |
| 3711 for(j=0; j<h->ref_count[1]; j++){ | |
| 3712 for(i=0; i<h->ref_count[0]; i++) | |
| 3713 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i]; | |
| 3714 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
| 3715 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
| 3716 } | |
| 3717 } | |
| 3718 | |
| 1168 | 3719 static int pred_weight_table(H264Context *h){ |
| 3720 MpegEncContext * const s = &h->s; | |
| 3721 int list, i; | |
| 2415 | 3722 int luma_def, chroma_def; |
| 2967 | 3723 |
| 2415 | 3724 h->use_weight= 0; |
| 3725 h->use_weight_chroma= 0; | |
| 1168 | 3726 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
| 3727 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2415 | 3728 luma_def = 1<<h->luma_log2_weight_denom; |
| 3729 chroma_def = 1<<h->chroma_log2_weight_denom; | |
| 1168 | 3730 |
| 3731 for(list=0; list<2; list++){ | |
| 3732 for(i=0; i<h->ref_count[list]; i++){ | |
| 3733 int luma_weight_flag, chroma_weight_flag; | |
| 2967 | 3734 |
| 1168 | 3735 luma_weight_flag= get_bits1(&s->gb); |
| 3736 if(luma_weight_flag){ | |
| 3737 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 3738 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2415 | 3739 if( h->luma_weight[list][i] != luma_def |
| 3740 || h->luma_offset[list][i] != 0) | |
| 3741 h->use_weight= 1; | |
| 3742 }else{ | |
| 3743 h->luma_weight[list][i]= luma_def; | |
| 3744 h->luma_offset[list][i]= 0; | |
| 1168 | 3745 } |
| 3746 | |
| 3747 chroma_weight_flag= get_bits1(&s->gb); | |
| 3748 if(chroma_weight_flag){ | |
| 3749 int j; | |
| 3750 for(j=0; j<2; j++){ | |
| 3751 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 3752 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2415 | 3753 if( h->chroma_weight[list][i][j] != chroma_def |
| 3754 || h->chroma_offset[list][i][j] != 0) | |
| 3755 h->use_weight_chroma= 1; | |
| 3756 } | |
| 3757 }else{ | |
| 3758 int j; | |
| 3759 for(j=0; j<2; j++){ | |
| 3760 h->chroma_weight[list][i][j]= chroma_def; | |
| 3761 h->chroma_offset[list][i][j]= 0; | |
| 1168 | 3762 } |
| 3763 } | |
| 3764 } | |
| 3765 if(h->slice_type != B_TYPE) break; | |
| 3766 } | |
| 2415 | 3767 h->use_weight= h->use_weight || h->use_weight_chroma; |
| 1168 | 3768 return 0; |
| 3769 } | |
| 3770 | |
| 2415 | 3771 static void implicit_weight_table(H264Context *h){ |
| 3772 MpegEncContext * const s = &h->s; | |
| 3773 int ref0, ref1; | |
| 3774 int cur_poc = s->current_picture_ptr->poc; | |
| 3775 | |
| 3776 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
| 3777 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
| 3778 h->use_weight= 0; | |
| 3779 h->use_weight_chroma= 0; | |
| 3780 return; | |
| 3781 } | |
| 3782 | |
| 3783 h->use_weight= 2; | |
| 3784 h->use_weight_chroma= 2; | |
| 3785 h->luma_log2_weight_denom= 5; | |
| 3786 h->chroma_log2_weight_denom= 5; | |
| 3787 | |
| 3788 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
| 3789 int poc0 = h->ref_list[0][ref0].poc; | |
| 3790 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
| 2519 | 3791 int poc1 = h->ref_list[1][ref1].poc; |
| 4594 | 3792 int td = av_clip(poc1 - poc0, -128, 127); |
| 2415 | 3793 if(td){ |
| 4594 | 3794 int tb = av_clip(cur_poc - poc0, -128, 127); |
| 4001 | 3795 int tx = (16384 + (FFABS(td) >> 1)) / td; |
| 4594 | 3796 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; |
| 2415 | 3797 if(dist_scale_factor < -64 || dist_scale_factor > 128) |
| 3798 h->implicit_weight[ref0][ref1] = 32; | |
| 3799 else | |
| 3800 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
| 3801 }else | |
| 3802 h->implicit_weight[ref0][ref1] = 32; | |
| 3803 } | |
| 3804 } | |
| 3805 } | |
| 3806 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3807 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
|
3808 int i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3809 pic->reference=0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3810 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
|
3811 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3812 else{ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3813 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
|
3814 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
|
3815 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3816 break; |
|
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 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3820 |
| 1168 | 3821 /** |
| 2392 | 3822 * instantaneous decoder refresh. |
| 1168 | 3823 */ |
| 3824 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
|
3825 int i; |
| 1168 | 3826 |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3827 for(i=0; i<16; i++){ |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3828 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
|
3829 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
|
3830 h->long_ref[i]= NULL; |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3831 } |
| 1168 | 3832 } |
| 3833 h->long_ref_count=0; | |
| 3834 | |
| 3835 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
|
3836 unreference_pic(h, h->short_ref[i]); |
| 1168 | 3837 h->short_ref[i]= NULL; |
| 3838 } | |
| 3839 h->short_ref_count=0; | |
| 3840 } | |
| 3841 | |
| 2640 | 3842 /* forget old pics after a seek */ |
| 3843 static void flush_dpb(AVCodecContext *avctx){ | |
| 3844 H264Context *h= avctx->priv_data; | |
| 3845 int i; | |
| 3144 | 3846 for(i=0; i<16; i++) { |
| 3847 if(h->delayed_pic[i]) | |
| 3848 h->delayed_pic[i]->reference= 0; | |
| 2640 | 3849 h->delayed_pic[i]= NULL; |
| 3144 | 3850 } |
| 3851 if(h->delayed_output_pic) | |
| 3852 h->delayed_output_pic->reference= 0; | |
| 2640 | 3853 h->delayed_output_pic= NULL; |
| 3854 idr(h); | |
|
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3855 if(h->s.current_picture_ptr) |
|
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3856 h->s.current_picture_ptr->reference= 0; |
| 2640 | 3857 } |
| 3858 | |
| 1168 | 3859 /** |
| 3860 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3861 * @return the removed picture or NULL if an error occurs |
| 1168 | 3862 */ |
| 3863 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 3864 MpegEncContext * const s = &h->s; |
| 1168 | 3865 int i; |
| 2967 | 3866 |
| 1169 | 3867 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
|
3868 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 2967 | 3869 |
| 1168 | 3870 for(i=0; i<h->short_ref_count; i++){ |
| 3871 Picture *pic= h->short_ref[i]; | |
| 1169 | 3872 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
|
3873 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 3874 if(pic->frame_num == frame_num){ |
| 3875 h->short_ref[i]= NULL; | |
| 3876 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 3877 h->short_ref_count--; | |
| 3878 return pic; | |
| 3879 } | |
| 3880 } | |
| 3881 return NULL; | |
| 3882 } | |
| 3883 | |
| 3884 /** | |
| 3885 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3886 * @return the removed picture or NULL if an error occurs |
| 1168 | 3887 */ |
| 3888 static Picture * remove_long(H264Context *h, int i){ | |
| 3889 Picture *pic; | |
| 3890 | |
| 3891 pic= h->long_ref[i]; | |
| 3892 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
|
3893 if(pic) h->long_ref_count--; |
| 1168 | 3894 |
| 3895 return pic; | |
| 3896 } | |
| 3897 | |
| 3898 /** | |
|
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
|
3899 * 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
|
3900 */ |
|
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 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
|
3902 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
|
3903 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
|
3904 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
|
3905 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
|
3906 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
|
3907 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
|
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 /** |
|
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 * 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
|
3914 */ |
|
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 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
|
3916 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
|
3917 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
|
3918 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
|
3919 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
|
3920 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
|
3921 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
|
3922 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
|
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 |
|
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
|
3928 /** |
| 1168 | 3929 * Executes the reference picture marking (memory management control operations). |
| 3930 */ | |
| 3931 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 3932 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
|
3933 int i, j; |
| 1168 | 3934 int current_is_long=0; |
| 3935 Picture *pic; | |
| 2967 | 3936 |
| 1168 | 3937 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
|
3938 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 2967 | 3939 |
| 1168 | 3940 for(i=0; i<mmco_count; i++){ |
| 3941 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
|
3942 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 | 3943 |
| 3944 switch(mmco[i].opcode){ | |
| 3945 case MMCO_SHORT2UNUSED: | |
| 3946 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
|
3947 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3948 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3949 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
|
3950 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n"); |
| 1168 | 3951 break; |
| 3952 case MMCO_SHORT2LONG: | |
| 3953 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
|
3954 if(pic) unreference_pic(h, pic); |
| 2967 | 3955 |
| 1168 | 3956 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
|
3957 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
|
3958 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
|
3959 h->long_ref_count++; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
3960 } |
| 1168 | 3961 break; |
| 3962 case MMCO_LONG2UNUSED: | |
| 3963 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
|
3964 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3965 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3966 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
|
3967 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n"); |
| 1168 | 3968 break; |
| 3969 case MMCO_LONG: | |
| 3970 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
|
3971 if(pic) unreference_pic(h, pic); |
| 2967 | 3972 |
| 1168 | 3973 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; |
| 3974 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 3975 h->long_ref_count++; | |
| 2967 | 3976 |
| 1168 | 3977 current_is_long=1; |
| 3978 break; | |
| 3979 case MMCO_SET_MAX_LONG: | |
| 3980 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
|
3981 // 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
|
3982 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
|
3983 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
|
3984 if (pic) unreference_pic(h, pic); |
| 1168 | 3985 } |
| 3986 break; | |
| 3987 case MMCO_RESET: | |
| 3988 while(h->short_ref_count){ | |
| 3989 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
|
3990 if(pic) unreference_pic(h, pic); |
| 1168 | 3991 } |
|
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
|
3992 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
|
3993 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
|
3994 if(pic) unreference_pic(h, pic); |
| 1168 | 3995 } |
| 3996 break; | |
| 3997 default: assert(0); | |
| 3998 } | |
| 3999 } | |
| 2967 | 4000 |
| 1168 | 4001 if(!current_is_long){ |
| 4002 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 4003 if(pic){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4004 unreference_pic(h, pic); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4005 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 4006 } |
| 2967 | 4007 |
| 1168 | 4008 if(h->short_ref_count) |
| 1169 | 4009 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 4010 | |
| 4011 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 4012 h->short_ref[0]->long_ref=0; |
| 4013 h->short_ref_count++; | |
| 4014 } | |
| 2967 | 4015 |
|
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
|
4016 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
|
4017 print_long_term(h); |
| 2967 | 4018 return 0; |
| 1168 | 4019 } |
| 4020 | |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4021 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){ |
| 1168 | 4022 MpegEncContext * const s = &h->s; |
| 4023 int i; | |
| 2967 | 4024 |
| 1168 | 4025 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
|
4026 s->broken_link= get_bits1(gb) -1; |
|
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4027 h->mmco[0].long_index= get_bits1(gb) - 1; // current_long_term_idx |
| 1168 | 4028 if(h->mmco[0].long_index == -1) |
| 4029 h->mmco_index= 0; | |
| 4030 else{ | |
| 4031 h->mmco[0].opcode= MMCO_LONG; | |
| 4032 h->mmco_index= 1; | |
| 2967 | 4033 } |
| 1168 | 4034 }else{ |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4035 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag |
| 2967 | 4036 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
|
4037 MMCOOpcode opcode= get_ue_golomb(gb); |
| 1168 | 4038 |
| 4039 h->mmco[i].opcode= opcode; | |
| 4040 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
|
4041 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 | 4042 /* 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
|
4043 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); |
| 1168 | 4044 return -1; |
| 4045 }*/ | |
| 4046 } | |
| 4047 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
|
4048 unsigned int long_index= get_ue_golomb(gb); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4049 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
|
4050 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 4051 return -1; |
| 4052 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4053 h->mmco[i].long_index= long_index; |
| 1168 | 4054 } |
| 2967 | 4055 |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4056 if(opcode > (unsigned)MMCO_LONG){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4057 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 4058 return -1; |
| 4059 } | |
|
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
|
4060 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
|
4061 break; |
| 1168 | 4062 } |
| 4063 h->mmco_index= i; | |
| 4064 }else{ | |
| 4065 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 4066 | |
| 4067 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 4068 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 4069 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 4070 h->mmco_index= 1; | |
| 4071 }else | |
| 4072 h->mmco_index= 0; | |
| 4073 } | |
| 4074 } | |
| 2967 | 4075 |
| 4076 return 0; | |
| 1168 | 4077 } |
| 4078 | |
| 4079 static int init_poc(H264Context *h){ | |
| 4080 MpegEncContext * const s = &h->s; | |
| 4081 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 4082 int field_poc[2]; | |
| 4083 | |
| 4084 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4085 h->frame_num_offset= 0; | |
| 4086 }else{ | |
| 4087 if(h->frame_num < h->prev_frame_num) | |
| 4088 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 4089 else | |
| 4090 h->frame_num_offset= h->prev_frame_num_offset; | |
| 4091 } | |
| 4092 | |
| 4093 if(h->sps.poc_type==0){ | |
| 4094 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 4095 | |
|
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
|
4096 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
|
4097 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
|
4098 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
|
4099 } |
|
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
|
4100 |
| 1168 | 4101 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) |
| 4102 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 4103 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 4104 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 4105 else | |
| 4106 h->poc_msb = h->prev_poc_msb; | |
| 4107 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 2967 | 4108 field_poc[0] = |
| 1168 | 4109 field_poc[1] = h->poc_msb + h->poc_lsb; |
| 2967 | 4110 if(s->picture_structure == PICT_FRAME) |
| 1168 | 4111 field_poc[1] += h->delta_poc_bottom; |
| 4112 }else if(h->sps.poc_type==1){ | |
| 4113 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 4114 int i; | |
| 4115 | |
| 4116 if(h->sps.poc_cycle_length != 0) | |
| 4117 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 4118 else | |
| 4119 abs_frame_num = 0; | |
| 4120 | |
| 4121 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 4122 abs_frame_num--; | |
| 2967 | 4123 |
| 1168 | 4124 expected_delta_per_poc_cycle = 0; |
| 4125 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 4126 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 4127 | |
| 4128 if(abs_frame_num > 0){ | |
| 4129 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 4130 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 4131 | |
| 4132 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 4133 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 4134 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 4135 } else | |
| 4136 expectedpoc = 0; | |
| 4137 | |
| 2967 | 4138 if(h->nal_ref_idc == 0) |
| 1168 | 4139 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; |
| 2967 | 4140 |
| 1168 | 4141 field_poc[0] = expectedpoc + h->delta_poc[0]; |
| 4142 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 4143 | |
| 4144 if(s->picture_structure == PICT_FRAME) | |
| 4145 field_poc[1] += h->delta_poc[1]; | |
| 4146 }else{ | |
| 4147 int poc; | |
| 4148 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4149 poc= 0; | |
| 4150 }else{ | |
| 4151 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 4152 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 4153 } | |
| 4154 field_poc[0]= poc; | |
| 4155 field_poc[1]= poc; | |
| 4156 } | |
| 2967 | 4157 |
| 1168 | 4158 if(s->picture_structure != PICT_BOTTOM_FIELD) |
| 4159 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 4160 if(s->picture_structure != PICT_TOP_FIELD) | |
| 4161 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 4162 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 4163 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 4164 | |
| 4165 return 0; | |
| 4166 } | |
| 4167 | |
|
5160
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 /** |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4170 * initialize scan tables |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4171 */ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4172 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
|
4173 MpegEncContext * const s = &h->s; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4174 int i; |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4175 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
|
4176 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
|
4177 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
|
4178 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4179 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
|
4180 #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
|
4181 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
|
4182 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
|
4183 #undef T |
|
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 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4186 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
|
4187 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
|
4188 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
|
4189 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
|
4190 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
|
4191 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4192 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
|
4193 #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
|
4194 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
|
4195 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
|
4196 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
|
4197 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
|
4198 #undef T |
|
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 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4201 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
|
4202 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
|
4203 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
|
4204 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
|
4205 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
|
4206 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
|
4207 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
|
4208 }else{ |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4209 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
|
4210 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
|
4211 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
|
4212 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
|
4213 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
|
4214 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
|
4215 } |
|
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4216 } |
| 1168 | 4217 /** |
| 4218 * decodes a slice header. | |
| 4219 * this will allso call MPV_common_init() and frame_start() as needed | |
| 4220 */ | |
| 4221 static int decode_slice_header(H264Context *h){ | |
| 4222 MpegEncContext * const s = &h->s; | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4223 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
|
4224 unsigned int pps_id; |
| 1168 | 4225 int num_ref_idx_active_override_flag; |
| 4226 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
|
4227 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
|
4228 int default_ref_list_done = 0; |
| 1168 | 4229 |
| 4230 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
|
4231 s->dropable= h->nal_ref_idc == 0; |
| 1168 | 4232 |
| 4233 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 4234 | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4235 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
|
4236 h->slice_num = 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4237 s->current_picture_ptr= NULL; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4238 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
4239 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4240 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
|
4241 if(slice_type > 9){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4242 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 | 4243 return -1; |
| 1168 | 4244 } |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4245 if(slice_type > 4){ |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4246 slice_type -= 5; |
| 1168 | 4247 h->slice_type_fixed=1; |
| 4248 }else | |
| 4249 h->slice_type_fixed=0; | |
| 2967 | 4250 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4251 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
|
4252 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
|
4253 || (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
|
4254 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
|
4255 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4256 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
|
4257 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4258 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though |
| 2967 | 4259 |
| 1168 | 4260 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
|
4261 if(pps_id>=MAX_PPS_COUNT){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4262 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 4263 return -1; |
| 4264 } | |
| 5079 | 4265 if(!h->pps_buffers[pps_id]) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4266 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 4267 return -1; |
| 4268 } | |
| 5079 | 4269 h->pps= *h->pps_buffers[pps_id]; |
| 4270 | |
| 4271 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
|
4272 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 4273 return -1; |
| 4274 } | |
| 5079 | 4275 h->sps = *h->sps_buffers[h->pps.sps_id]; |
| 2919 | 4276 |
| 4363 | 4277 if(h->dequant_coeff_pps != pps_id){ |
| 4278 h->dequant_coeff_pps = pps_id; | |
| 2919 | 4279 init_dequant_tables(h); |
| 4280 } | |
| 2967 | 4281 |
| 1168 | 4282 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
|
4283 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
| 2967 | 4284 |
| 3178 | 4285 h->b_stride= s->mb_width*4; |
| 4286 h->b8_stride= s->mb_width*2; | |
| 1168 | 4287 |
| 1371 | 4288 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 4289 if(h->sps.frame_mbs_only_flag) |
| 1371 | 4290 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 4291 else |
| 1371 | 4292 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 2967 | 4293 |
| 4294 if (s->context_initialized | |
| 1548 | 4295 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 4296 free_tables(h); |
| 4297 MPV_common_end(s); | |
| 4298 } | |
| 4299 if (!s->context_initialized) { | |
| 4300 if (MPV_common_init(s) < 0) | |
| 4301 return -1; | |
| 2967 | 4302 |
|
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas ?man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
4303 init_scan_tables(h); |
| 1168 | 4304 alloc_tables(h); |
| 4305 | |
| 4306 s->avctx->width = s->width; | |
| 4307 s->avctx->height = s->height; | |
| 1548 | 4308 s->avctx->sample_aspect_ratio= h->sps.sar; |
| 2440 | 4309 if(!s->avctx->sample_aspect_ratio.den) |
| 4310 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
|
4311 |
| 2648 | 4312 if(h->sps.timing_info_present_flag){ |
| 3052 | 4313 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
|
4314 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
|
4315 s->avctx->time_base.den *= 2; |
|
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4316 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
|
4317 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
|
4318 } |
| 1168 | 4319 } |
| 4320 | |
| 2392 | 4321 if(h->slice_num == 0){ |
| 2935 | 4322 if(frame_start(h) < 0) |
| 4323 return -1; | |
| 1168 | 4324 } |
| 4325 | |
| 1169 | 4326 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 4327 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 4328 | |
| 3316 | 4329 h->mb_mbaff = 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4330 h->mb_aff_frame = 0; |
| 1168 | 4331 if(h->sps.frame_mbs_only_flag){ |
| 4332 s->picture_structure= PICT_FRAME; | |
| 4333 }else{ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4334 if(get_bits1(&s->gb)) { //field_pic_flag |
| 1168 | 4335 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
| 3316 | 4336 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
|
4337 } else { |
| 1168 | 4338 s->picture_structure= PICT_FRAME; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4339 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
|
4340 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4341 } |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4342 assert(s->mb_num == s->mb_width * s->mb_height); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4343 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
|
4344 first_mb_in_slice >= s->mb_num){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4345 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
|
4346 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4347 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4348 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
| 3316 | 4349 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
|
4350 assert(s->mb_y < s->mb_height); |
| 2967 | 4351 |
| 1168 | 4352 if(s->picture_structure==PICT_FRAME){ |
| 4353 h->curr_pic_num= h->frame_num; | |
| 4354 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 4355 }else{ | |
| 4356 h->curr_pic_num= 2*h->frame_num; | |
| 4357 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 4358 } | |
| 2967 | 4359 |
| 1168 | 4360 if(h->nal_unit_type == NAL_IDR_SLICE){ |
| 1453 | 4361 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 4362 } |
| 2967 | 4363 |
| 1168 | 4364 if(h->sps.poc_type==0){ |
| 4365 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 2967 | 4366 |
| 1168 | 4367 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ |
| 4368 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 4369 } | |
| 4370 } | |
| 2967 | 4371 |
| 1168 | 4372 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ |
| 4373 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 2967 | 4374 |
| 1168 | 4375 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) |
| 4376 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 4377 } | |
| 2967 | 4378 |
| 1168 | 4379 init_poc(h); |
| 2967 | 4380 |
| 1168 | 4381 if(h->pps.redundant_pic_cnt_present){ |
| 4382 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 4383 } | |
| 4384 | |
| 4385 //set defaults, might be overriden a few line later | |
| 4386 h->ref_count[0]= h->pps.ref_count[0]; | |
| 4387 h->ref_count[1]= h->pps.ref_count[1]; | |
| 4388 | |
| 4389 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 4390 if(h->slice_type == B_TYPE){ | |
| 4391 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 3316 | 4392 if(h->sps.mb_aff && h->direct_spatial_mv_pred) |
| 4393 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n"); | |
| 1168 | 4394 } |
| 4395 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 2967 | 4396 |
| 1168 | 4397 if(num_ref_idx_active_override_flag){ |
| 4398 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 4399 if(h->slice_type==B_TYPE) | |
| 4400 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4401 | |
| 4532 | 4402 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
|
4403 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
|
4404 h->ref_count[0]= h->ref_count[1]= 1; |
| 1168 | 4405 return -1; |
| 4406 } | |
| 4407 } | |
| 4532 | 4408 if(h->slice_type == B_TYPE) |
| 4409 h->list_count= 2; | |
| 4410 else | |
| 4411 h->list_count= 1; | |
| 4412 }else | |
| 4413 h->list_count= 0; | |
| 1168 | 4414 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4415 if(!default_ref_list_done){ |
| 1168 | 4416 fill_default_ref_list(h); |
| 4417 } | |
| 4418 | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4419 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
|
4420 return -1; |
| 1168 | 4421 |
| 2967 | 4422 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) |
| 1168 | 4423 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) |
| 4424 pred_weight_table(h); | |
| 2415 | 4425 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 4426 implicit_weight_table(h); | |
| 4427 else | |
| 4428 h->use_weight = 0; | |
| 2967 | 4429 |
|
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
4430 if(s->current_picture.reference) |
|
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
4431 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
|
4432 |
| 3316 | 4433 if(FRAME_MBAFF) |
| 4434 fill_mbaff_ref_list(h); | |
| 4435 | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4436 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
|
4437 tmp = get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4438 if(tmp > 2){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4439 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
|
4440 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4441 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4442 h->cabac_init_idc= tmp; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4443 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4444 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4445 h->last_qscale_diff = 0; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4446 tmp = h->pps.init_qp + get_se_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4447 if(tmp>51){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4448 av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); |
| 1898 | 4449 return -1; |
| 4450 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4451 s->qscale= tmp; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4452 h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4453 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale); |
| 1168 | 4454 //FIXME qscale / qp ... stuff |
| 4455 if(h->slice_type == SP_TYPE){ | |
| 1453 | 4456 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 4457 } |
| 4458 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 4459 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 4460 } |
| 4461 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4462 h->deblocking_filter = 1; |
| 1898 | 4463 h->slice_alpha_c0_offset = 0; |
| 4464 h->slice_beta_offset = 0; | |
| 1168 | 4465 if( h->pps.deblocking_filter_parameters_present ) { |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4466 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4467 if(tmp > 2){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4468 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
|
4469 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4470 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4471 h->deblocking_filter= tmp; |
| 2967 | 4472 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
|
4473 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
|
4474 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4475 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
|
4476 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
|
4477 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 4478 } |
|
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
|
4479 } |
| 2792 | 4480 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
| 4481 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) | |
| 4482 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE) | |
| 4483 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) | |
| 4484 h->deblocking_filter= 0; | |
| 1168 | 4485 |
| 4486 #if 0 //FMO | |
| 4487 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 4488 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 4489 #endif | |
| 4490 | |
| 2392 | 4491 h->slice_num++; |
| 4492 | |
| 3316 | 4493 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; |
| 4494 h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width; | |
| 4495 | |
| 1168 | 4496 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
|
4497 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
|
4498 h->slice_num, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4499 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
| 2967 | 4500 first_mb_in_slice, |
| 1264 | 4501 av_get_pict_type_char(h->slice_type), |
| 1168 | 4502 pps_id, h->frame_num, |
| 4503 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 4504 h->ref_count[0], h->ref_count[1], | |
| 4505 s->qscale, | |
| 2583 | 4506 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
| 2415 | 4507 h->use_weight, |
| 4508 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
| 1168 | 4509 ); |
| 4510 } | |
| 4511 | |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4512 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
|
4513 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
|
4514 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
|
4515 }else{ |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4516 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
|
4517 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
|
4518 } |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3776
diff
changeset
|
4519 |
| 1168 | 4520 return 0; |
| 4521 } | |
| 4522 | |
| 4523 /** | |
| 4524 * | |
| 4525 */ | |
| 4526 static inline int get_level_prefix(GetBitContext *gb){ | |
| 4527 unsigned int buf; | |
| 4528 int log; | |
| 2967 | 4529 |
| 1168 | 4530 OPEN_READER(re, gb); |
| 4531 UPDATE_CACHE(re, gb); | |
| 4532 buf=GET_CACHE(re, gb); | |
| 2967 | 4533 |
| 1168 | 4534 log= 32 - av_log2(buf); |
| 4535 #ifdef TRACE | |
| 4536 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
|
4537 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 | 4538 #endif |
| 4539 | |
| 4540 LAST_SKIP_BITS(re, gb, log); | |
| 4541 CLOSE_READER(re, gb); | |
| 4542 | |
| 4543 return log-1; | |
| 4544 } | |
| 4545 | |
| 2755 | 4546 static inline int get_dct8x8_allowed(H264Context *h){ |
| 4547 int i; | |
| 4548 for(i=0; i<4; i++){ | |
| 4549 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
|
4550 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))) |
| 2755 | 4551 return 0; |
| 4552 } | |
| 4553 return 1; | |
| 4554 } | |
| 4555 | |
| 1168 | 4556 /** |
| 4557 * decodes a residual block. | |
| 4558 * @param n block index | |
| 4559 * @param scantable scantable | |
| 4560 * @param max_coeff number of coefficients in the block | |
| 4561 * @return <0 if an error occured | |
| 4562 */ | |
| 2919 | 4563 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ |
| 1168 | 4564 MpegEncContext * const s = &h->s; |
| 4565 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 | 4566 int level[16]; |
| 4567 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before; | |
| 1168 | 4568 |
| 4569 //FIXME put trailing_onex into the context | |
| 4570 | |
| 4571 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 4572 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 4573 total_coeff= coeff_token>>2; | |
| 2967 | 4574 }else{ |
| 1168 | 4575 if(n == LUMA_DC_BLOCK_INDEX){ |
| 4576 total_coeff= pred_non_zero_count(h, 0); | |
| 4577 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4578 total_coeff= coeff_token>>2; | |
| 4579 }else{ | |
| 4580 total_coeff= pred_non_zero_count(h, n); | |
| 4581 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4582 total_coeff= coeff_token>>2; | |
| 4583 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 4584 } | |
| 4585 } | |
| 4586 | |
| 4587 //FIXME set last_non_zero? | |
| 4588 | |
| 4589 if(total_coeff==0) | |
| 4590 return 0; | |
|
4391
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4591 if(total_coeff > (unsigned)max_coeff) { |
|
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4592 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 | 4593 return -1; |
| 4594 } | |
| 2967 | 4595 |
| 1168 | 4596 trailing_ones= coeff_token&3; |
| 4600 | 4597 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 4598 assert(total_coeff<=16); |
| 2967 | 4599 |
| 1168 | 4600 for(i=0; i<trailing_ones; i++){ |
| 4601 level[i]= 1 - 2*get_bits1(gb); | |
| 4602 } | |
| 4603 | |
| 2897 | 4604 if(i<total_coeff) { |
| 1168 | 4605 int level_code, mask; |
| 2897 | 4606 int suffix_length = total_coeff > 10 && trailing_ones < 3; |
| 4607 int prefix= get_level_prefix(gb); | |
| 4608 | |
| 4609 //first coefficient has suffix_length equal to 0 or 1 | |
| 1168 | 4610 if(prefix<14){ //FIXME try to build a large unified VLC table for all this |
| 4611 if(suffix_length) | |
| 4612 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4613 else | |
| 4614 level_code= (prefix<<suffix_length); //part | |
| 4615 }else if(prefix==14){ | |
| 4616 if(suffix_length) | |
| 4617 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4618 else | |
| 4619 level_code= prefix + get_bits(gb, 4); //part | |
| 4620 }else if(prefix==15){ | |
| 4621 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
|
4622 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
| 1168 | 4623 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4624 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4625 return -1; |
| 4626 } | |
| 4627 | |
| 2897 | 4628 if(trailing_ones < 3) level_code += 2; |
| 4629 | |
| 4630 suffix_length = 1; | |
| 4631 if(level_code > 5) | |
| 4632 suffix_length++; | |
| 1168 | 4633 mask= -(level_code&1); |
| 4634 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 2897 | 4635 i++; |
| 4636 | |
| 4637 //remaining coefficients have suffix_length > 0 | |
| 4638 for(;i<total_coeff;i++) { | |
| 4639 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX }; | |
| 4640 prefix = get_level_prefix(gb); | |
| 4641 if(prefix<15){ | |
| 4642 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length); | |
| 4643 }else if(prefix==15){ | |
| 4644 level_code = (prefix<<suffix_length) + get_bits(gb, 12); | |
| 4645 }else{ | |
| 4646 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); | |
| 4647 return -1; | |
| 4648 } | |
| 4649 mask= -(level_code&1); | |
| 4650 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 4651 if(level_code > suffix_limit[suffix_length]) | |
| 4652 suffix_length++; | |
| 4653 } | |
| 1168 | 4654 } |
| 4655 | |
| 4656 if(total_coeff == max_coeff) | |
| 4657 zeros_left=0; | |
| 4658 else{ | |
| 4659 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 4660 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 4661 else | |
| 4662 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 4663 } | |
| 2897 | 4664 |
| 4665 coeff_num = zeros_left + total_coeff - 1; | |
| 4666 j = scantable[coeff_num]; | |
| 4667 if(n > 24){ | |
| 4668 block[j] = level[0]; | |
| 4669 for(i=1;i<total_coeff;i++) { | |
| 4670 if(zeros_left <= 0) | |
| 4671 run_before = 0; | |
| 4672 else if(zeros_left < 7){ | |
| 4673 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4674 }else{ | |
| 4675 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4676 } | |
| 4677 zeros_left -= run_before; | |
| 4678 coeff_num -= 1 + run_before; | |
| 4679 j= scantable[ coeff_num ]; | |
| 4680 | |
| 4681 block[j]= level[i]; | |
| 4682 } | |
| 4683 }else{ | |
| 2919 | 4684 block[j] = (level[0] * qmul[j] + 32)>>6; |
| 2897 | 4685 for(i=1;i<total_coeff;i++) { |
| 4686 if(zeros_left <= 0) | |
| 4687 run_before = 0; | |
| 4688 else if(zeros_left < 7){ | |
| 4689 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4690 }else{ | |
| 4691 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4692 } | |
| 4693 zeros_left -= run_before; | |
| 4694 coeff_num -= 1 + run_before; | |
| 4695 j= scantable[ coeff_num ]; | |
| 4696 | |
| 2919 | 4697 block[j]= (level[i] * qmul[j] + 32)>>6; |
| 2897 | 4698 } |
| 1168 | 4699 } |
| 4700 | |
| 4701 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4702 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4703 return -1; |
| 4704 } | |
| 2897 | 4705 |
| 1168 | 4706 return 0; |
| 4707 } | |
| 4708 | |
| 3316 | 4709 static void predict_field_decoding_flag(H264Context *h){ |
| 4710 MpegEncContext * const s = &h->s; | |
| 4711 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
| 4712 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) | |
| 4713 ? s->current_picture.mb_type[mb_xy-1] | |
| 4714 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) | |
| 4715 ? s->current_picture.mb_type[mb_xy-s->mb_stride] | |
| 4716 : 0; | |
| 4717 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; | |
| 4718 } | |
| 4719 | |
| 1168 | 4720 /** |
| 2396 | 4721 * decodes a P_SKIP or B_SKIP macroblock |
| 4722 */ | |
| 4723 static void decode_mb_skip(H264Context *h){ | |
| 4724 MpegEncContext * const s = &h->s; | |
| 4725 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
|
4726 int mb_type=0; |
| 2967 | 4727 |
| 2396 | 4728 memset(h->non_zero_count[mb_xy], 0, 16); |
| 4729 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
| 4730 | |
| 3316 | 4731 if(MB_FIELD) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4732 mb_type|= MB_TYPE_INTERLACED; |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4733 |
| 2396 | 4734 if( h->slice_type == B_TYPE ) |
| 4735 { | |
| 4736 // 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
|
4737 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
| 2396 | 4738 |
| 2449 | 4739 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4740 pred_direct_motion(h, &mb_type); |
| 3927 | 4741 mb_type|= MB_TYPE_SKIP; |
| 2396 | 4742 } |
| 4743 else | |
| 4744 { | |
| 4745 int mx, my; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4746 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
| 2396 | 4747 |
| 2449 | 4748 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4749 pred_pskip_motion(h, &mx, &my); |
| 4750 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 4751 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
| 4752 } | |
| 4753 | |
| 4754 write_back_motion(h, mb_type); | |
| 3927 | 4755 s->current_picture.mb_type[mb_xy]= mb_type; |
| 2396 | 4756 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 4757 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
|
4758 h->prev_mb_skipped= 1; |
| 2396 | 4759 } |
| 4760 | |
| 4761 /** | |
| 1168 | 4762 * decodes a macroblock |
| 4763 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 4764 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4765 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 4766 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
|
4767 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
|
4768 int partition_count; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4769 unsigned int mb_type, cbp; |
| 2755 | 4770 int dct8x8_allowed= h->pps.transform_8x8_mode; |
| 1168 | 4771 |
| 2967 | 4772 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
| 1168 | 4773 |
| 4600 | 4774 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 4775 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 4776 down the code */ | |
| 1168 | 4777 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 4778 if(s->mb_skip_run==-1) | |
| 4779 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 2967 | 4780 |
| 1168 | 4781 if (s->mb_skip_run--) { |
| 3316 | 4782 if(FRAME_MBAFF && (s->mb_y&1) == 0){ |
| 4783 if(s->mb_skip_run==0) | |
| 4784 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
| 4785 else | |
| 4786 predict_field_decoding_flag(h); | |
| 4787 } | |
| 2396 | 4788 decode_mb_skip(h); |
| 1168 | 4789 return 0; |
| 4790 } | |
| 4791 } | |
| 3316 | 4792 if(FRAME_MBAFF){ |
| 4793 if( (s->mb_y&1) == 0 ) | |
| 4794 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
| 1168 | 4795 }else |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4796 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
| 2967 | 4797 |
|
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
|
4798 h->prev_mb_skipped= 0; |
| 2967 | 4799 |
| 1168 | 4800 mb_type= get_ue_golomb(&s->gb); |
| 4801 if(h->slice_type == B_TYPE){ | |
| 4802 if(mb_type < 23){ | |
| 4803 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 4804 mb_type= b_mb_type_info[mb_type].type; | |
| 4805 }else{ | |
| 4806 mb_type -= 23; | |
| 4807 goto decode_intra_mb; | |
| 4808 } | |
| 4809 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 4810 if(mb_type < 5){ | |
| 4811 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 4812 mb_type= p_mb_type_info[mb_type].type; | |
| 4813 }else{ | |
| 4814 mb_type -= 5; | |
| 4815 goto decode_intra_mb; | |
| 4816 } | |
| 4817 }else{ | |
| 4818 assert(h->slice_type == I_TYPE); | |
| 4819 decode_intra_mb: | |
| 4820 if(mb_type > 25){ | |
| 3954 | 4821 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 | 4822 return -1; |
| 4823 } | |
| 4824 partition_count=0; | |
| 4825 cbp= i_mb_type_info[mb_type].cbp; | |
| 4826 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 4827 mb_type= i_mb_type_info[mb_type].type; | |
| 4828 } | |
| 4829 | |
| 3316 | 4830 if(MB_FIELD) |
| 1168 | 4831 mb_type |= MB_TYPE_INTERLACED; |
| 4832 | |
| 4833 h->slice_table[ mb_xy ]= h->slice_num; | |
| 2967 | 4834 |
| 1168 | 4835 if(IS_INTRA_PCM(mb_type)){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4836 unsigned int x, y; |
| 2967 | 4837 |
| 5127 | 4838 // We assume these blocks are very rare so we do not optimize it. |
| 1168 | 4839 align_get_bits(&s->gb); |
| 2967 | 4840 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4841 // The pixels are stored in the same order as levels in h->mb array. |
| 1168 | 4842 for(y=0; y<16; y++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4843 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
| 1168 | 4844 for(x=0; x<16; x++){ |
| 4600 | 4845 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
|
4846 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
| 1168 | 4847 } |
| 4848 } | |
| 4849 for(y=0; y<8; y++){ | |
| 4850 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 4851 for(x=0; x<8; x++){ | |
| 4600 | 4852 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
|
4853 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4854 } |
| 4855 } | |
| 4856 for(y=0; y<8; y++){ | |
| 4857 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 4858 for(x=0; x<8; x++){ | |
| 4600 | 4859 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
|
4860 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4861 } |
| 4862 } | |
| 2967 | 4863 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4864 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4865 s->current_picture.qscale_table[mb_xy]= 0; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4866 h->chroma_qp[0] = get_chroma_qp(h, 0, 0); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4867 h->chroma_qp[1] = get_chroma_qp(h, 1, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4868 // 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
|
4869 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2967 | 4870 |
| 2755 | 4871 s->current_picture.mb_type[mb_xy]= mb_type; |
| 1168 | 4872 return 0; |
| 4873 } | |
| 2967 | 4874 |
| 3316 | 4875 if(MB_MBAFF){ |
| 4876 h->ref_count[0] <<= 1; | |
| 4877 h->ref_count[1] <<= 1; | |
| 4878 } | |
| 4879 | |
| 2449 | 4880 fill_caches(h, mb_type, 0); |
| 1168 | 4881 |
| 4882 //mb_pred | |
| 4883 if(IS_INTRA(mb_type)){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4884 int pred_mode; |
| 1168 | 4885 // init_top_left_availability(h); |
| 4886 if(IS_INTRA4x4(mb_type)){ | |
| 4887 int i; | |
| 2755 | 4888 int di = 1; |
| 4889 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
| 4890 mb_type |= MB_TYPE_8x8DCT; | |
| 4891 di = 4; | |
| 4892 } | |
| 1168 | 4893 |
| 4894 // fill_intra4x4_pred_table(h); | |
| 2755 | 4895 for(i=0; i<16; i+=di){ |
| 3409 | 4896 int mode= pred_intra_mode(h, i); |
| 4897 | |
| 4898 if(!get_bits1(&s->gb)){ | |
| 1168 | 4899 const int rem_mode= get_bits(&s->gb, 3); |
| 3409 | 4900 mode = rem_mode + (rem_mode >= mode); |
| 1168 | 4901 } |
| 2967 | 4902 |
| 2755 | 4903 if(di==4) |
| 4904 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 4905 else | |
| 4906 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 1168 | 4907 } |
| 4908 write_back_intra_pred_mode(h); | |
| 4909 if( check_intra4x4_pred_mode(h) < 0) | |
| 4910 return -1; | |
| 4911 }else{ | |
| 4912 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 4913 if(h->intra16x16_pred_mode < 0) | |
| 4914 return -1; | |
| 4915 } | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4916 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4917 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
|
4918 if(pred_mode < 0) |
| 1168 | 4919 return -1; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4920 h->chroma_pred_mode= pred_mode; |
| 1168 | 4921 }else if(partition_count==4){ |
| 4922 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 2967 | 4923 |
| 1168 | 4924 if(h->slice_type == B_TYPE){ |
| 4925 for(i=0; i<4; i++){ | |
| 4926 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4927 if(h->sub_mb_type[i] >=13){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4928 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 | 4929 return -1; |
| 4930 } | |
| 4931 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4932 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4933 } | |
| 2396 | 4934 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 3003 | 4935 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { |
| 2396 | 4936 pred_direct_motion(h, &mb_type); |
| 3003 | 4937 h->ref_cache[0][scan8[4]] = |
| 4938 h->ref_cache[1][scan8[4]] = | |
| 4939 h->ref_cache[0][scan8[12]] = | |
| 4940 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | |
| 4941 } | |
| 1168 | 4942 }else{ |
| 4943 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 4944 for(i=0; i<4; i++){ | |
| 4945 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4946 if(h->sub_mb_type[i] >=4){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4947 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 | 4948 return -1; |
| 4949 } | |
| 4950 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4951 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4952 } | |
| 4953 } | |
| 2967 | 4954 |
| 4533 | 4955 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
|
4956 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
| 1168 | 4957 for(i=0; i<4; i++){ |
| 2396 | 4958 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 4959 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4960 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
|
4961 if(tmp>=ref_count){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4962 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
|
4963 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4964 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4965 ref[list][i]= tmp; |
| 1168 | 4966 }else{ |
| 4967 //FIXME | |
| 4968 ref[list][i] = -1; | |
| 4969 } | |
| 4970 } | |
| 4971 } | |
| 2967 | 4972 |
| 2755 | 4973 if(dct8x8_allowed) |
| 4974 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 2967 | 4975 |
| 4533 | 4976 for(list=0; list<h->list_count; list++){ |
| 1168 | 4977 for(i=0; i<4; i++){ |
| 3003 | 4978 if(IS_DIRECT(h->sub_mb_type[i])) { |
| 4979 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ]; | |
| 4980 continue; | |
| 4981 } | |
| 1168 | 4982 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
| 4983 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 4984 | |
| 2396 | 4985 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
| 1168 | 4986 const int sub_mb_type= h->sub_mb_type[i]; |
| 4987 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 4988 for(j=0; j<sub_partition_count[i]; j++){ | |
| 4989 int mx, my; | |
| 4990 const int index= 4*i + block_width*j; | |
| 4991 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 4992 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 4993 mx += get_se_golomb(&s->gb); | |
| 4994 my += get_se_golomb(&s->gb); | |
| 4600 | 4995 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 4996 |
| 1168 | 4997 if(IS_SUB_8X8(sub_mb_type)){ |
| 4530 | 4998 mv_cache[ 1 ][0]= |
| 1168 | 4999 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
| 4530 | 5000 mv_cache[ 1 ][1]= |
| 1168 | 5001 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
| 5002 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 4530 | 5003 mv_cache[ 1 ][0]= mx; |
| 5004 mv_cache[ 1 ][1]= my; | |
| 1168 | 5005 }else if(IS_SUB_4X8(sub_mb_type)){ |
| 4530 | 5006 mv_cache[ 8 ][0]= mx; |
| 5007 mv_cache[ 8 ][1]= my; | |
| 1168 | 5008 } |
| 4530 | 5009 mv_cache[ 0 ][0]= mx; |
| 5010 mv_cache[ 0 ][1]= my; | |
| 1168 | 5011 } |
| 5012 }else{ | |
| 5013 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 5014 p[0] = p[1]= | |
| 5015 p[8] = p[9]= 0; | |
| 5016 } | |
| 5017 } | |
| 5018 } | |
| 2396 | 5019 }else if(IS_DIRECT(mb_type)){ |
| 5020 pred_direct_motion(h, &mb_type); | |
| 2755 | 5021 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 5022 }else{ |
| 1168 | 5023 int list, mx, my, i; |
| 5024 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 5025 if(IS_16X16(mb_type)){ | |
| 4534 | 5026 for(list=0; list<h->list_count; list++){ |
| 5027 unsigned int val; | |
| 1168 | 5028 if(IS_DIR(mb_type, 0, list)){ |
| 4534 | 5029 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5030 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5031 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
|
5032 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5033 } |
| 2523 | 5034 }else |
| 4534 | 5035 val= LIST_NOT_USED&0xFF; |
| 5036 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 5037 } | |
| 5038 for(list=0; list<h->list_count; list++){ | |
| 5039 unsigned int val; | |
| 1168 | 5040 if(IS_DIR(mb_type, 0, list)){ |
| 5041 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 5042 mx += get_se_golomb(&s->gb); | |
| 5043 my += get_se_golomb(&s->gb); | |
| 4600 | 5044 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5045 |
| 4534 | 5046 val= pack16to32(mx,my); |
| 2523 | 5047 }else |
| 4534 | 5048 val=0; |
| 5049 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4); | |
| 1168 | 5050 } |
| 5051 } | |
| 5052 else if(IS_16X8(mb_type)){ | |
| 4534 | 5053 for(list=0; list<h->list_count; list++){ |
| 1168 | 5054 for(i=0; i<2; i++){ |
| 4534 | 5055 unsigned int val; |
| 1168 | 5056 if(IS_DIR(mb_type, i, list)){ |
| 4534 | 5057 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5058 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5059 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
|
5060 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5061 } |
| 2523 | 5062 }else |
| 4534 | 5063 val= LIST_NOT_USED&0xFF; |
| 5064 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 1168 | 5065 } |
| 4534 | 5066 } |
| 5067 for(list=0; list<h->list_count; list++){ | |
| 1168 | 5068 for(i=0; i<2; i++){ |
| 4534 | 5069 unsigned int val; |
| 1168 | 5070 if(IS_DIR(mb_type, i, list)){ |
| 5071 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 5072 mx += get_se_golomb(&s->gb); | |
| 5073 my += get_se_golomb(&s->gb); | |
| 4600 | 5074 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5075 |
| 4534 | 5076 val= pack16to32(mx,my); |
| 2396 | 5077 }else |
| 4534 | 5078 val=0; |
| 5079 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4); | |
| 1168 | 5080 } |
| 5081 } | |
| 5082 }else{ | |
| 5083 assert(IS_8X16(mb_type)); | |
| 4534 | 5084 for(list=0; list<h->list_count; list++){ |
| 1168 | 5085 for(i=0; i<2; i++){ |
| 4534 | 5086 unsigned int val; |
| 1168 | 5087 if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
| 4534 | 5088 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5089 if(val >= h->ref_count[list]){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5090 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
|
5091 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5092 } |
| 2523 | 5093 }else |
| 4534 | 5094 val= LIST_NOT_USED&0xFF; |
| 5095 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 1168 | 5096 } |
| 4534 | 5097 } |
| 5098 for(list=0; list<h->list_count; list++){ | |
| 1168 | 5099 for(i=0; i<2; i++){ |
| 4534 | 5100 unsigned int val; |
| 1168 | 5101 if(IS_DIR(mb_type, i, list)){ |
| 5102 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 5103 mx += get_se_golomb(&s->gb); | |
| 5104 my += get_se_golomb(&s->gb); | |
| 4600 | 5105 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
| 1170 | 5106 |
| 4534 | 5107 val= pack16to32(mx,my); |
| 2396 | 5108 }else |
| 4534 | 5109 val=0; |
| 5110 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4); | |
| 1168 | 5111 } |
| 5112 } | |
| 5113 } | |
| 5114 } | |
| 2967 | 5115 |
| 1168 | 5116 if(IS_INTER(mb_type)) |
| 5117 write_back_motion(h, mb_type); | |
| 2967 | 5118 |
| 1168 | 5119 if(!IS_INTRA16x16(mb_type)){ |
| 5120 cbp= get_ue_golomb(&s->gb); | |
| 5121 if(cbp > 47){ | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5122 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 5123 return -1; |
| 5124 } | |
| 2967 | 5125 |
| 1168 | 5126 if(IS_INTRA4x4(mb_type)) |
| 5127 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 5128 else | |
| 5129 cbp= golomb_to_inter_cbp[cbp]; | |
| 5130 } | |
| 3651 | 5131 h->cbp = cbp; |
| 1168 | 5132 |
| 2755 | 5133 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
| 5134 if(get_bits1(&s->gb)) | |
| 5135 mb_type |= MB_TYPE_8x8DCT; | |
| 5136 } | |
| 5137 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 5138 | |
| 1168 | 5139 if(cbp || IS_INTRA16x16(mb_type)){ |
| 5140 int i8x8, i4x4, chroma_idx; | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
5141 int dquant; |
| 1168 | 5142 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; |
| 3174 | 5143 const uint8_t *scan, *scan8x8, *dc_scan; |
| 2967 | 5144 |
| 1168 | 5145 // fill_non_zero_count_cache(h); |
| 5146 | |
| 5147 if(IS_INTERLACED(mb_type)){ | |
| 3316 | 5148 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0; |
| 2763 | 5149 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
| 1168 | 5150 dc_scan= luma_dc_field_scan; |
| 5151 }else{ | |
| 3316 | 5152 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0; |
| 2763 | 5153 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
| 1168 | 5154 dc_scan= luma_dc_zigzag_scan; |
| 5155 } | |
| 5156 | |
| 5157 dquant= get_se_golomb(&s->gb); | |
| 5158 | |
| 5159 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5160 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 | 5161 return -1; |
| 5162 } | |
| 2967 | 5163 |
| 1168 | 5164 s->qscale += dquant; |
| 5165 if(((unsigned)s->qscale) > 51){ | |
| 5166 if(s->qscale<0) s->qscale+= 52; | |
| 5167 else s->qscale-= 52; | |
| 5168 } | |
| 2967 | 5169 |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
5170 h->chroma_qp[0]= get_chroma_qp(h, 0, s->qscale); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
5171 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale); |
| 1168 | 5172 if(IS_INTRA16x16(mb_type)){ |
| 2919 | 5173 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
|
5174 return -1; //FIXME continue if partitioned and other return -1 too |
| 1168 | 5175 } |
| 5176 | |
| 5177 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 5178 | |
| 5179 if(cbp&15){ | |
| 5180 for(i8x8=0; i8x8<4; i8x8++){ | |
| 5181 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5182 const int index= i4x4 + 4*i8x8; | |
| 2919 | 5183 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){ |
| 1168 | 5184 return -1; |
| 5185 } | |
| 5186 } | |
| 5187 } | |
| 5188 }else{ | |
| 1636 | 5189 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 5190 } |
| 5191 }else{ | |
| 5192 for(i8x8=0; i8x8<4; i8x8++){ | |
| 5193 if(cbp & (1<<i8x8)){ | |
| 2755 | 5194 if(IS_8x8DCT(mb_type)){ |
| 5195 DCTELEM *buf = &h->mb[64*i8x8]; | |
| 2757 | 5196 uint8_t *nnz; |
| 2755 | 5197 for(i4x4=0; i4x4<4; i4x4++){ |
| 3174 | 5198 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4, |
| 2919 | 5199 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 ) |
| 2755 | 5200 return -1; |
| 5201 } | |
| 2757 | 5202 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
|
5203 nnz[0] += nnz[1] + nnz[8] + nnz[9]; |
| 2755 | 5204 }else{ |
| 5205 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5206 const int index= i4x4 + 4*i8x8; | |
| 2967 | 5207 |
| 2919 | 5208 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 | 5209 return -1; |
| 5210 } | |
| 1168 | 5211 } |
| 5212 } | |
| 5213 }else{ | |
| 5214 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 5215 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 5216 } | |
| 5217 } | |
| 5218 } | |
| 2967 | 5219 |
| 1168 | 5220 if(cbp&0x30){ |
| 5221 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 2919 | 5222 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){ |
| 1168 | 5223 return -1; |
| 5224 } | |
| 5225 } | |
| 5226 | |
| 5227 if(cbp&0x20){ | |
| 5228 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
5229 const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[chroma_idx]]; |
| 1168 | 5230 for(i4x4=0; i4x4<4; i4x4++){ |
| 5231 const int index= 16 + 4*chroma_idx + i4x4; | |
|
5225
099c495618c1
Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents:
5215
diff
changeset
|
5232 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){ |
| 1168 | 5233 return -1; |
| 5234 } | |
| 5235 } | |
| 5236 } | |
| 5237 }else{ | |
| 5238 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 5239 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 5240 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 5241 } | |
| 5242 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5243 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
|
5244 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
|
5245 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
|
5246 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 5247 } |
|
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
|
5248 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 5249 write_back_non_zero_count(h); |
| 5250 | |
| 3316 | 5251 if(MB_MBAFF){ |
| 5252 h->ref_count[0] >>= 1; | |
| 5253 h->ref_count[1] >>= 1; | |
| 5254 } | |
| 5255 | |
| 1168 | 5256 return 0; |
| 5257 } | |
| 5258 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5259 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
|
5260 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
|
5261 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
|
5262 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
|
5263 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
|
5264 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
|
5265 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5266 unsigned int ctx = 0; |
| 2967 | 5267 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5268 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
|
5269 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5270 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5271 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
|
5272 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5273 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5274 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5275 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
|
5276 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5277 |
| 2312 | 5278 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
| 5279 uint8_t *state= &h->cabac_state[ctx_base]; | |
| 5280 int mb_type; | |
| 2967 | 5281 |
| 2312 | 5282 if(intra_slice){ |
| 5283 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
|
5284 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
|
5285 const int mbb_xy = h->top_mb_xy; |
| 2312 | 5286 int ctx=0; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5287 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
|
5288 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5289 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
|
5290 ctx++; |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5291 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 ) |
| 2312 | 5292 return 0; /* I4x4 */ |
| 5293 state += 2; | |
| 5294 }else{ | |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5295 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
|
5296 return 0; /* I4x4 */ |
| 2312 | 5297 } |
| 5298 | |
| 5299 if( get_cabac_terminate( &h->cabac ) ) | |
| 5300 return 25; /* PCM */ | |
| 5301 | |
| 5302 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
|
5303 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
|
5304 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
|
5305 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
|
5306 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
|
5307 mb_type += 1 * get_cabac_noinline( &h->cabac, &state[3+2*intra_slice] ); |
| 2312 | 5308 return mb_type; |
| 5309 } | |
| 5310 | |
| 5311 static int decode_cabac_mb_type( H264Context *h ) { | |
| 5312 MpegEncContext * const s = &h->s; | |
| 5313 | |
| 5314 if( h->slice_type == I_TYPE ) { | |
| 5315 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
|
5316 } 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
|
5317 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
|
5318 /* 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
|
5319 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
| 3138 | 5320 /* 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
|
5321 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
|
5322 } else { |
| 3138 | 5323 /* 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
|
5324 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
|
5325 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5326 } else { |
| 2312 | 5327 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
|
5328 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5329 } 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
|
5330 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
|
5331 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
|
5332 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
|
5333 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5334 |
| 3138 | 5335 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
|
5336 ctx++; |
| 3138 | 5337 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
|
5338 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5339 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5340 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
|
5341 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
|
5342 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5343 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
|
5344 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
|
5345 } |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5346 |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5347 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
|
5348 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
|
5349 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
|
5350 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
|
5351 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
|
5352 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
|
5353 else if( bits == 13 ) { |
| 2312 | 5354 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
|
5355 } 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
|
5356 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
|
5357 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
|
5358 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
|
5359 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5360 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
|
5361 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
|
5362 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5363 /* 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
|
5364 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
|
5365 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5366 } |
|
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 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
|
5369 MpegEncContext * const s = &h->s; |
| 3316 | 5370 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
|
5371 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
|
5372 |
| 3316 | 5373 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches? |
| 5374 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride; | |
| 5375 mba_xy = mb_xy - 1; | |
| 5376 if( (mb_y&1) | |
| 5377 && h->slice_table[mba_xy] == h->slice_num | |
| 5378 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) | |
| 5379 mba_xy += s->mb_stride; | |
| 5380 if( MB_FIELD ){ | |
| 5381 mbb_xy = mb_xy - s->mb_stride; | |
| 5382 if( !(mb_y&1) | |
| 5383 && h->slice_table[mbb_xy] == h->slice_num | |
| 5384 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) | |
| 5385 mbb_xy -= s->mb_stride; | |
| 5386 }else | |
| 5387 mbb_xy = mb_x + (mb_y-1)*s->mb_stride; | |
| 5388 }else{ | |
| 5389 int mb_xy = mb_x + mb_y*s->mb_stride; | |
| 5390 mba_xy = mb_xy - 1; | |
| 5391 mbb_xy = mb_xy - s->mb_stride; | |
| 5392 } | |
| 5393 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5394 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
|
5395 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5396 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
|
5397 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5398 |
| 3138 | 5399 if( h->slice_type == B_TYPE ) |
| 5400 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
|
5401 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
|
5402 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5403 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5404 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
|
5405 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
|
5406 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5407 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
|
5408 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
|
5409 |
| 2928 | 5410 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
| 5411 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
| 5412 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
| 5413 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5414 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
|
5415 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
|
5416 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5417 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5420 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
|
5421 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
|
5422 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
|
5423 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5424 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
|
5425 |
|
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
|
5426 /* 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
|
5427 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
|
5428 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
|
5429 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5430 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
|
5431 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5432 |
|
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+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
|
5434 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
|
5435 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5436 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
|
5437 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
|
5438 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
|
5439 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
|
5440 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5441 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
|
5442 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5443 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5444 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
|
5445 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
|
5446 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5447 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
|
5448 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
|
5449 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5450 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
|
5451 { 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
|
5452 { 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
|
5453 { 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
|
5454 { 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
|
5455 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5456 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5457 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
|
5458 int cbp = 0; |
| 3138 | 5459 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
|
5460 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
|
5461 |
| 3138 | 5462 if( h->slice_table[h->top_mb_xy] == h->slice_num ) { |
| 5463 cbp_b = h->top_cbp; | |
| 4600 | 5464 tprintf(h->s.avctx, "cbp_b = top_cbp = %x\n", cbp_b); |
| 3138 | 5465 } |
| 5466 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5467 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
|
5468 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
|
5469 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
|
5470 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
|
5471 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5472 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
|
5473 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
|
5474 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5475 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
|
5476 cbp_a = cbp; |
| 3138 | 5477 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
|
5478 cbp_a = h->left_cbp; |
| 4600 | 5479 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
|
5480 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5481 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5482 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
|
5483 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
|
5484 |
|
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
|
5485 /* 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
|
5486 /* 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
|
5487 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
|
5488 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
|
5489 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
|
5490 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5491 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5492 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5493 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
|
5494 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
|
5495 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
|
5496 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5499 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
|
5500 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
|
5501 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5502 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5503 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
|
5504 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5505 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
|
5506 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
|
5507 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
|
5508 |
| 2314 | 5509 cbp_a = (h->left_cbp>>4)&0x03; |
| 5510 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
|
5511 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5512 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
|
5513 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
|
5514 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
|
5515 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
|
5516 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
|
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 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
|
5519 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
|
5520 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
|
5521 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
|
5522 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5523 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
|
5524 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
|
5525 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
|
5526 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
|
5527 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
|
5528 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5529 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
|
5530 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
|
5531 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5532 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
|
5533 |
| 3316 | 5534 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
|
5535 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5536 |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5537 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
|
5538 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
|
5539 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
|
5540 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5541 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
|
5542 val++; |
| 3128 | 5543 if(val > 102) //prevent infinite loop |
|
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
5544 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
|
5545 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5546 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5547 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
|
5548 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
|
5549 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5550 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
|
5551 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5552 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
|
5553 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
|
5554 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
|
5555 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
|
5556 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
|
5557 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
|
5558 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
|
5559 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
|
5560 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5561 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
|
5562 int type; |
|
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[36] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5564 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
|
5565 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
|
5566 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
|
5567 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5568 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
|
5569 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
|
5570 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
|
5571 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5572 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5573 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
|
5574 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
|
5575 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
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 |
| 2755 | 5578 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
|
5579 return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); |
| 2755 | 5580 } |
| 5581 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5582 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
|
5583 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
|
5584 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
|
5585 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
|
5586 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
|
5587 |
| 2396 | 5588 if( h->slice_type == B_TYPE) { |
| 5589 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
| 5590 ctx++; | |
| 5591 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
| 5592 ctx += 2; | |
| 5593 } else { | |
| 5594 if( refa > 0 ) | |
| 5595 ctx++; | |
| 5596 if( refb > 0 ) | |
| 5597 ctx += 2; | |
| 5598 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5599 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5600 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
|
5601 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5602 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
|
5603 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5604 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5605 ctx = 5; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5606 if(ref >= 32 /*h->ref_list[list]*/){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5607 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
|
5608 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
|
5609 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5610 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5611 return ref; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5612 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5613 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5614 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
|
5615 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
|
5616 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
|
5617 int ctxbase = (l == 0) ? 40 : 47; |
| 2317 | 5618 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
|
5619 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5620 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
|
5621 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5622 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
|
5623 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5624 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5625 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5626 |
| 2317 | 5627 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
| 5628 return 0; | |
| 5629 | |
| 5630 mvd= 1; | |
| 5631 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
|
5632 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
|
5633 mvd++; |
| 2317 | 5634 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
|
5635 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5636 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5637 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5638 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
|
5639 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
|
5640 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
|
5641 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
|
5642 k++; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5643 if(k>24){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5644 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
|
5645 return INT_MIN; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5646 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5647 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5648 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5649 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
|
5650 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
|
5651 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5652 } |
| 4042 | 5653 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
|
5654 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5655 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
5656 static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
| 2314 | 5657 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
|
5658 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
|
5659 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5660 if( cat == 0 ) { |
| 2314 | 5661 nza = h->left_cbp&0x100; |
| 5662 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
|
5663 } else if( cat == 1 || cat == 2 ) { |
| 2314 | 5664 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
| 5665 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
|
5666 } else if( cat == 3 ) { |
| 2314 | 5667 nza = (h->left_cbp>>(6+idx))&0x01; |
| 5668 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
| 5669 } else { | |
| 5670 assert(cat == 4); | |
| 5671 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
| 5672 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
| 5673 } | |
| 5674 | |
| 5675 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
|
5676 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5677 |
| 2314 | 5678 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
|
5679 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
|
5680 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5681 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
|
5682 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5683 |
|
5006
28ebdd244a07
Change some leftover __attribute__((unused)) and __attribute__((used)) to
reimar
parents:
4984
diff
changeset
|
5684 static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = { |
| 4051 | 5685 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 5686 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
| 5687 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
| 5688 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
| 5689 }; | |
| 5690 | |
| 3028 | 5691 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
|
5692 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
| 3316 | 5693 static const int significant_coeff_flag_offset[2][6] = { |
| 5694 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 }, | |
| 5695 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 } | |
| 5696 }; | |
| 5697 static const int last_coeff_flag_offset[2][6] = { | |
| 5698 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 }, | |
| 5699 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 } | |
| 5700 }; | |
| 5701 static const int coeff_abs_level_m1_offset[6] = { | |
| 5702 227+0, 227+10, 227+20, 227+30, 227+39, 426 | |
| 5703 }; | |
| 4007 | 5704 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = { |
| 3316 | 5705 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, |
| 2755 | 5706 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, |
| 5707 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
| 3316 | 5708 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 }, |
| 5709 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5, | |
| 5710 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11, | |
| 5711 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9, | |
| 5712 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 } | |
| 2755 | 5713 }; |
| 5714 | |
| 5715 int index[64]; | |
| 2313 | 5716 |
| 5262 | 5717 int av_unused 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
|
5718 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
|
5719 |
| 2316 | 5720 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
|
5721 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
|
5722 |
| 2898 | 5723 uint8_t *significant_coeff_ctx_base; |
| 5724 uint8_t *last_coeff_ctx_base; | |
| 5725 uint8_t *abs_level_m1_ctx_base; | |
| 2755 | 5726 |
|
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
|
5727 #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
|
5728 #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
|
5729 #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
|
5730 #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
|
5731 #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
|
5732 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
|
5733 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
|
5734 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
|
5735 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
|
5736 #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
|
5737 #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
|
5738 #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
|
5739 |
|
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
|
5740 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5741 /* 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
|
5742 * 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
|
5743 * 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
|
5744 * 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
|
5745 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
| 2755 | 5746 * 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
|
5747 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5748 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5749 /* read coded block flag */ |
| 2898 | 5750 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
|
5751 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { |
| 2755 | 5752 if( cat == 1 || cat == 2 ) |
| 5753 h->non_zero_count_cache[scan8[n]] = 0; | |
| 5754 else if( cat == 4 ) | |
| 5755 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
|
5756 #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
|
5757 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
|
5758 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
|
5759 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
|
5760 #endif |
| 2755 | 5761 return 0; |
| 5762 } | |
| 2898 | 5763 } |
| 5764 | |
| 5765 significant_coeff_ctx_base = h->cabac_state | |
| 3316 | 5766 + significant_coeff_flag_offset[MB_FIELD][cat]; |
| 2898 | 5767 last_coeff_ctx_base = h->cabac_state |
| 3316 | 5768 + last_coeff_flag_offset[MB_FIELD][cat]; |
| 2898 | 5769 abs_level_m1_ctx_base = h->cabac_state |
| 5770 + coeff_abs_level_m1_offset[cat]; | |
| 5771 | |
| 5772 if( cat == 5 ) { | |
| 5773 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \ | |
| 5774 for(last= 0; last < coefs; last++) { \ | |
| 5775 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
|
5776 if( get_cabac( CC, sig_ctx )) { \ |
| 2898 | 5777 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \ |
| 5778 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
|
5779 if( get_cabac( CC, last_ctx ) ) { \ |
| 2898 | 5780 last= max_coeff; \ |
| 5781 break; \ | |
| 5782 } \ | |
| 5783 } \ | |
|
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
|
5784 }\ |
|
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
|
5785 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
|
5786 index[coeff_count++] = last;\ |
| 2898 | 5787 } |
| 4009 | 5788 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
|
5789 #if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) |
| 4051 | 5790 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); |
| 5791 } else { | |
| 5792 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); | |
| 5793 #else | |
| 3316 | 5794 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] ); |
| 2898 | 5795 } else { |
| 5796 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
|
5797 #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
|
5798 } |
| 2316 | 5799 assert(coeff_count > 0); |
| 5800 | |
| 5801 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
|
5802 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
|
5803 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
|
5804 h->non_zero_count_cache[scan8[n]] = coeff_count; |
| 2316 | 5805 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
|
5806 h->cbp_table[mb_xy] |= 0x40 << n; |
| 2755 | 5807 else if( cat == 4 ) |
| 5808 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
| 2316 | 5809 else { |
| 2755 | 5810 assert( cat == 5 ); |
|
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
5811 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); |
| 2316 | 5812 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5813 |
|
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
|
5814 for( coeff_count--; coeff_count >= 0; coeff_count-- ) { |
| 2898 | 5815 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
|
5816 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
|
5817 |
|
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
|
5818 if( get_cabac( CC, ctx ) == 0 ) { |
| 2898 | 5819 if( !qmul ) { |
| 4040 | 5820 block[j] = get_cabac_bypass_sign( CC, -1); |
| 2316 | 5821 }else{ |
| 4040 | 5822 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;; |
| 2316 | 5823 } |
| 2967 | 5824 |
| 2313 | 5825 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
|
5826 } else { |
| 2313 | 5827 int coeff_abs = 2; |
| 2898 | 5828 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
|
5829 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) { |
| 2313 | 5830 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
|
5831 } |
| 2313 | 5832 |
| 5833 if( coeff_abs >= 15 ) { | |
| 5834 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
|
5835 while( get_cabac_bypass( CC ) ) { |
| 2313 | 5836 j++; |
| 5837 } | |
| 2967 | 5838 |
| 4016 | 5839 coeff_abs=1; |
| 2313 | 5840 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
|
5841 coeff_abs += coeff_abs + get_cabac_bypass( CC ); |
| 2313 | 5842 } |
| 4016 | 5843 coeff_abs+= 14; |
| 2313 | 5844 } |
| 5845 | |
| 2898 | 5846 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
|
5847 if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs; |
| 2316 | 5848 else block[j] = coeff_abs; |
| 5849 }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
|
5850 if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6; |
| 2919 | 5851 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6; |
| 2316 | 5852 } |
| 2967 | 5853 |
| 2313 | 5854 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
|
5855 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5856 } |
|
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
|
5857 #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
|
5858 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
|
5859 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
|
5860 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
|
5861 #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
|
5862 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
|
5863 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5864 |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
5865 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
|
5866 { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5867 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
|
5868 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
|
5869 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
|
5870 h->left_mb_xy[0] = mb_xy - 1; |
| 3316 | 5871 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
|
5872 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
|
5873 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
|
5874 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
|
5875 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
| 3316 | 5876 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
|
5877 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
|
5878 if (bottom |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5879 ? !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
|
5880 : (!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
|
5881 ) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5882 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
|
5883 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5884 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
|
5885 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
|
5886 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5887 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5888 return; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5889 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5890 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5891 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5892 * 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
|
5893 * @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
|
5894 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5895 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
|
5896 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
|
5897 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
|
5898 int mb_type, partition_count, cbp = 0; |
| 2755 | 5899 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
|
5900 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5901 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
|
5902 |
| 4600 | 5903 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
|
5904 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) { |
| 3316 | 5905 int skip; |
| 5906 /* a skipped mb needs the aff flag from the following mb */ | |
| 5907 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 ) | |
| 5908 predict_field_decoding_flag(h); | |
| 5909 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped ) | |
| 5910 skip = h->next_mb_skipped; | |
| 5911 else | |
| 5912 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
|
5913 /* read skip flags */ |
| 3316 | 5914 if( skip ) { |
| 5915 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ | |
| 5916 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; | |
| 5917 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); | |
| 5918 if(h->next_mb_skipped) | |
| 5919 predict_field_decoding_flag(h); | |
| 5920 else | |
| 5921 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | |
| 5922 } | |
| 5923 | |
| 2396 | 5924 decode_mb_skip(h); |
| 5925 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5926 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
|
5927 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
|
5928 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
|
5929 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5930 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
|
5931 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5932 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5933 } |
| 3316 | 5934 if(FRAME_MBAFF){ |
| 5935 if( (s->mb_y&1) == 0 ) | |
| 5936 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
|
5937 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
|
5938 }else |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5939 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
|
5940 |
|
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
|
5941 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
|
5942 |
| 3077 | 5943 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
|
5944 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
|
5945 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
|
5946 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
|
5947 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5948 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5949 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
|
5950 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
|
5951 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
|
5952 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
|
5953 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5954 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
|
5955 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
|
5956 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5957 } 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
|
5958 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
|
5959 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
|
5960 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
|
5961 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5962 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
|
5963 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
|
5964 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5965 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5966 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
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 } |
| 3316 | 5973 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
|
5974 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
|
5975 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5976 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
|
5977 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5978 if(IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5979 const uint8_t *ptr; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5980 unsigned int x, y; |
| 2967 | 5981 |
| 5127 | 5982 // 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
|
5983 // 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
|
5984 // 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
|
5985 ptr= h->cabac.bytestream; |
| 4344 | 5986 if(h->cabac.low&0x1) ptr--; |
| 5987 if(CABAC_BITS==16){ | |
| 5988 if(h->cabac.low&0x1FF) ptr--; | |
| 5989 } | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5990 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5991 // 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
|
5992 for(y=0; y<16; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5993 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
|
5994 for(x=0; x<16; x++){ |
| 4600 | 5995 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
|
5996 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
|
5997 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5998 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5999 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6000 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
|
6001 for(x=0; x<8; x++){ |
| 4600 | 6002 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
|
6003 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
|
6004 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6005 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6006 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6007 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
|
6008 for(x=0; x<8; x++){ |
| 4600 | 6009 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
|
6010 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
|
6011 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6012 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6013 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6014 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
|
6015 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6016 // All blocks are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6017 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
|
6018 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
|
6019 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6020 s->current_picture.qscale_table[mb_xy]= 0; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6021 h->chroma_qp[0] = get_chroma_qp(h, 0, 0); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6022 h->chroma_qp[1] = get_chroma_qp(h, 1, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6023 // All coeffs are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6024 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2755 | 6025 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
|
6026 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
|
6027 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6028 |
| 3316 | 6029 if(MB_MBAFF){ |
| 6030 h->ref_count[0] <<= 1; | |
| 6031 h->ref_count[1] <<= 1; | |
| 6032 } | |
| 6033 | |
| 2449 | 6034 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
|
6035 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6036 if( IS_INTRA( mb_type ) ) { |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6037 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
|
6038 if( IS_INTRA4x4( mb_type ) ) { |
| 2755 | 6039 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
| 6040 mb_type |= MB_TYPE_8x8DCT; | |
| 6041 for( i = 0; i < 16; i+=4 ) { | |
| 6042 int pred = pred_intra_mode( h, i ); | |
| 6043 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
| 6044 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 6045 } | |
| 6046 } else { | |
| 6047 for( i = 0; i < 16; i++ ) { | |
| 6048 int pred = pred_intra_mode( h, i ); | |
| 6049 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
|
6050 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6051 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
| 2755 | 6052 } |
|
1908
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 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
|
6055 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
|
6056 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6057 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
|
6058 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
|
6059 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6060 h->chroma_pred_mode_table[mb_xy] = |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6061 pred_mode = decode_cabac_mb_chroma_pre_mode( h ); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6062 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6063 pred_mode= check_intra_pred_mode( h, pred_mode ); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6064 if( pred_mode < 0 ) return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6065 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
|
6066 } 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
|
6067 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
|
6068 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6069 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
|
6070 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
|
6071 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
|
6072 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
|
6073 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
|
6074 } |
| 3482 | 6075 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] | |
| 6076 h->sub_mb_type[2] | h->sub_mb_type[3]) ) { | |
| 2396 | 6077 pred_direct_motion(h, &mb_type); |
| 6078 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
| 6079 for( i = 0; i < 4; i++ ) | |
| 6080 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
| 6081 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
| 6082 } | |
| 6083 } | |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6084 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6085 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
|
6086 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
|
6087 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
|
6088 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
|
6089 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6090 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6091 |
| 4533 | 6092 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
|
6093 for( i = 0; i < 4; i++ ) { |
| 2396 | 6094 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 6095 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
|
6096 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
|
6097 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
|
6098 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6099 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
|
6100 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6101 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
|
6102 } |
| 2110 | 6103 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
|
6104 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
|
6105 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6106 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6107 |
| 2755 | 6108 if(dct8x8_allowed) |
| 6109 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 6110 | |
| 4533 | 6111 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
|
6112 for(i=0; i<4; i++){ |
| 2396 | 6113 if(IS_DIRECT(h->sub_mb_type[i])){ |
| 6114 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
| 6115 continue; | |
| 6116 } | |
| 2110 | 6117 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
|
6118 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6119 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
|
6120 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
|
6121 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
|
6122 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
|
6123 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
|
6124 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
|
6125 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
|
6126 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
|
6127 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
|
6128 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
|
6129 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6130 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
|
6131 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 ); |
| 4600 | 6132 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
|
6133 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6134 if(IS_SUB_8X8(sub_mb_type)){ |
| 4530 | 6135 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
|
6136 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
| 4530 | 6137 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
|
6138 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
|
6139 |
| 4530 | 6140 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
|
6141 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx; |
| 4530 | 6142 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
|
6143 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
|
6144 }else if(IS_SUB_8X4(sub_mb_type)){ |
| 4530 | 6145 mv_cache[ 1 ][0]= mx; |
| 6146 mv_cache[ 1 ][1]= my; | |
| 6147 | |
| 6148 mvd_cache[ 1 ][0]= mx - mpx; | |
| 6149 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
|
6150 }else if(IS_SUB_4X8(sub_mb_type)){ |
| 4530 | 6151 mv_cache[ 8 ][0]= mx; |
| 6152 mv_cache[ 8 ][1]= my; | |
| 6153 | |
| 6154 mvd_cache[ 8 ][0]= mx - mpx; | |
| 6155 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
|
6156 } |
| 4530 | 6157 mv_cache[ 0 ][0]= mx; |
| 6158 mv_cache[ 0 ][1]= my; | |
| 6159 | |
| 6160 mvd_cache[ 0 ][0]= mx - mpx; | |
| 6161 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
|
6162 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6163 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6164 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
|
6165 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
|
6166 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
|
6167 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
|
6168 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6169 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6170 } |
| 2396 | 6171 } else if( IS_DIRECT(mb_type) ) { |
| 6172 pred_direct_motion(h, &mb_type); | |
| 6173 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 6174 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 2755 | 6175 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 6176 } else { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6177 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
|
6178 if(IS_16X16(mb_type)){ |
| 4534 | 6179 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
|
6180 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
|
6181 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
|
6182 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); |
| 2523 | 6183 }else |
| 4534 | 6184 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 |
| 6185 } | |
| 6186 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
|
6187 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
|
6188 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
|
6189 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6190 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
|
6191 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 ); |
| 4600 | 6192 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
|
6193 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6194 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
|
6195 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 6196 }else |
| 6197 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
|
6198 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6199 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6200 else if(IS_16X8(mb_type)){ |
| 4533 | 6201 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
|
6202 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
|
6203 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
|
6204 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
|
6205 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
| 2396 | 6206 }else |
| 6207 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
|
6208 } |
| 4533 | 6209 } |
| 6210 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
|
6211 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
|
6212 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
|
6213 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
|
6214 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
|
6215 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 ); |
| 4600 | 6216 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
|
6217 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6218 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
|
6219 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2523 | 6220 }else{ |
| 2396 | 6221 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
| 6222 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
|
6223 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6224 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6225 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6226 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6227 assert(IS_8X16(mb_type)); |
| 4533 | 6228 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
|
6229 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
|
6230 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
|
6231 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
|
6232 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
| 2396 | 6233 }else |
| 6234 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
|
6235 } |
| 4533 | 6236 } |
| 6237 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
|
6238 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
|
6239 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
|
6240 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
|
6241 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
|
6242 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
|
6243 |
| 4600 | 6244 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
|
6245 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
|
6246 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 6247 }else{ |
| 2396 | 6248 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
| 6249 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
|
6250 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6251 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6252 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
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 |
|
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
|
6256 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
|
6257 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
|
6258 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
|
6259 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6260 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6261 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
|
6262 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
|
6263 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
|
6264 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6265 |
| 3651 | 6266 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
|
6267 |
| 2755 | 6268 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
| 6269 if( decode_cabac_mb_transform_size( h ) ) | |
| 6270 mb_type |= MB_TYPE_8x8DCT; | |
| 6271 } | |
| 6272 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 6273 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6274 if( cbp || IS_INTRA16x16( mb_type ) ) { |
| 3174 | 6275 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
|
6276 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
|
6277 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6278 if(IS_INTERLACED(mb_type)){ |
| 3316 | 6279 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; |
| 2763 | 6280 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
|
6281 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
|
6282 }else{ |
| 3316 | 6283 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; |
| 2763 | 6284 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
|
6285 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
|
6286 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6287 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6288 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
|
6289 if( dqp == INT_MIN ){ |
|
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6290 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
|
6291 return -1; |
|
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6292 } |
|
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 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
|
6294 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
|
6295 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
|
6296 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
|
6297 } |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6298 h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6299 h->chroma_qp[1] = get_chroma_qp(h, 1, 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
|
6300 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6301 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
|
6302 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
|
6303 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
| 2898 | 6304 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
|
6305 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
|
6306 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
|
6307 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
|
6308 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
| 2919 | 6309 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
|
6310 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
|
6311 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6312 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6313 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
|
6314 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6315 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6316 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
|
6317 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
|
6318 if( cbp & (1<<i8x8) ) { |
| 2755 | 6319 if( IS_8x8DCT(mb_type) ) { |
| 6320 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, | |
| 3174 | 6321 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64) < 0 ) |
| 2755 | 6322 return -1; |
| 6323 } 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
|
6324 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
|
6325 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
|
6326 //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
|
6327 //START_TIMER |
| 2919 | 6328 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
|
6329 return -1; |
|
3972
f5f1c9af095d
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents:
3955
diff
changeset
|
6330 //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
|
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 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6333 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
|
6334 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
|
6335 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6336 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6337 } |
|
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 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
|
6340 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
|
6341 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
|
6342 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
| 2898 | 6343 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
|
6344 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
|
6345 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6346 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6347 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6348 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
|
6349 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
|
6350 for( c = 0; c < 2; c++ ) { |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6351 const uint32_t *qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[c]]; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6352 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
|
6353 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
|
6354 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
|
5225
099c495618c1
Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents:
5215
diff
changeset
|
6355 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, qmul, 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
|
6356 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
|
6357 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6358 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6359 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6360 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
|
6361 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
|
6362 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
|
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 } else { |
| 2315 | 6365 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
| 6366 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
| 6367 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 6368 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 3316 | 6369 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
|
6370 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6371 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6372 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
|
6373 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
|
6374 |
| 3316 | 6375 if(MB_MBAFF){ |
| 6376 h->ref_count[0] >>= 1; | |
| 6377 h->ref_count[1] >>= 1; | |
| 6378 } | |
| 6379 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6380 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
|
6381 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6382 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6383 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6384 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
|
6385 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
|
6386 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
|
6387 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
|
6388 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
|
6389 |
| 2633 | 6390 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
|
6391 int8_t tc[4]; |
| 2633 | 6392 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
|
6393 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
| 2633 | 6394 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); |
| 6395 } else { | |
| 6396 /* 16px edge length, because bS=4 is triggered by being at | |
| 6397 * the edge of an intra MB, so all 4 bS are the same */ | |
| 6398 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6399 const int p0 = pix[-1]; |
| 6400 const int p1 = pix[-2]; | |
| 6401 const int p2 = pix[-3]; | |
| 6402 | |
| 6403 const int q0 = pix[0]; | |
| 6404 const int q1 = pix[1]; | |
| 6405 const int q2 = pix[2]; | |
| 6406 | |
| 4001 | 6407 if( FFABS( p0 - q0 ) < alpha && |
| 6408 FFABS( p1 - p0 ) < beta && | |
| 6409 FFABS( q1 - q0 ) < beta ) { | |
| 6410 | |
| 6411 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6412 if( FFABS( p2 - p0 ) < beta) | |
| 1898 | 6413 { |
| 6414 const int p3 = pix[-4]; | |
| 6415 /* p0', p1', p2' */ | |
| 6416 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6417 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6418 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6419 } else { | |
| 6420 /* p0' */ | |
| 6421 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6422 } | |
| 4001 | 6423 if( FFABS( q2 - q0 ) < beta) |
| 1898 | 6424 { |
| 6425 const int q3 = pix[3]; | |
| 6426 /* q0', q1', q2' */ | |
| 6427 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6428 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6429 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6430 } else { | |
| 6431 /* q0' */ | |
| 6432 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6433 } | |
| 6434 }else{ | |
| 6435 /* p0', q0' */ | |
| 6436 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6437 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6438 } | |
| 4600 | 6439 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
|
6440 } |
| 1898 | 6441 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
|
6442 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6443 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6444 } |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6445 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
| 2834 | 6446 int i; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6447 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
|
6448 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
|
6449 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
|
6450 |
| 2633 | 6451 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
|
6452 int8_t tc[4]; |
| 2633 | 6453 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
|
6454 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
| 2633 | 6455 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); |
| 6456 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6457 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
|
6458 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6459 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6460 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6461 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
|
6462 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6463 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
|
6464 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6465 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6466 int beta; |
| 2967 | 6467 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6468 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6469 int bS_index = (i >> 1); |
| 3316 | 6470 if (!MB_FIELD) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6471 bS_index &= ~1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6472 bS_index |= (i & 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6473 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6474 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6475 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6476 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6477 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6478 |
| 3316 | 6479 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
|
6480 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
|
6481 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
|
6482 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
|
6483 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6484 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
|
6485 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
|
6486 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6487 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6488 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6489 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6490 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6491 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6492 |
| 4001 | 6493 if( FFABS( p0 - q0 ) < alpha && |
| 6494 FFABS( p1 - p0 ) < beta && | |
| 6495 FFABS( q1 - q0 ) < beta ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6496 int tc = tc0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6497 int i_delta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6498 |
| 4001 | 6499 if( FFABS( p2 - p0 ) < beta ) { |
| 4594 | 6500 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
|
6501 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6502 } |
| 4001 | 6503 if( FFABS( q2 - q0 ) < beta ) { |
| 4594 | 6504 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
|
6505 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6506 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6507 |
| 4594 | 6508 i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
| 6509 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
| 6510 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
| 4600 | 6511 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
|
6512 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6513 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6514 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6515 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6516 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6517 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6518 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6519 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6520 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6521 |
| 4001 | 6522 if( FFABS( p0 - q0 ) < alpha && |
| 6523 FFABS( p1 - p0 ) < beta && | |
| 6524 FFABS( q1 - q0 ) < beta ) { | |
| 6525 | |
| 6526 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6527 if( FFABS( p2 - p0 ) < beta) | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6528 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6529 const int p3 = pix[-4]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6530 /* p0', p1', p2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6531 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
|
6532 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
|
6533 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
|
6534 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6535 /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6536 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
|
6537 } |
| 4001 | 6538 if( FFABS( q2 - q0 ) < beta) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6539 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6540 const int q3 = pix[3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6541 /* q0', q1', q2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6542 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
|
6543 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
|
6544 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
|
6545 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6546 /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6547 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
|
6548 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6549 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6550 /* p0', q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6551 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
|
6552 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
|
6553 } |
| 4600 | 6554 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
|
6555 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6556 } |
|
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 } |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6559 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
|
6560 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6561 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
|
6562 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6563 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6564 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6565 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6566 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6567 int bS_index = i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6568 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6569 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6570 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6571 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6572 |
| 3316 | 6573 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
|
6574 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
|
6575 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
|
6576 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset]; |
| 3316 | 6577 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6578 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
|
6579 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
|
6580 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6581 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6582 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6583 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6584 |
| 4001 | 6585 if( FFABS( p0 - q0 ) < alpha && |
| 6586 FFABS( p1 - p0 ) < beta && | |
| 6587 FFABS( q1 - q0 ) < beta ) { | |
| 4594 | 6588 const int i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
| 6589 | |
| 6590 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
| 6591 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
| 4600 | 6592 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
|
6593 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6594 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6595 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6596 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6597 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6598 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6599 |
| 4001 | 6600 if( FFABS( p0 - q0 ) < alpha && |
| 6601 FFABS( p1 - p0 ) < beta && | |
| 6602 FFABS( q1 - q0 ) < beta ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6603 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6604 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
|
6605 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ |
| 4600 | 6606 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
|
6607 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6608 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6609 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6610 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6611 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6612 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
|
6613 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
|
6614 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
|
6615 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
|
6616 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
|
6617 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
|
6618 |
| 2633 | 6619 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
|
6620 int8_t tc[4]; |
| 2633 | 6621 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
|
6622 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
| 2633 | 6623 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); |
| 6624 } else { | |
| 6625 /* 16px edge length, see filter_mb_edgev */ | |
| 6626 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6627 const int p0 = pix[-1*pix_next]; |
| 6628 const int p1 = pix[-2*pix_next]; | |
| 6629 const int p2 = pix[-3*pix_next]; | |
| 6630 const int q0 = pix[0]; | |
| 6631 const int q1 = pix[1*pix_next]; | |
| 6632 const int q2 = pix[2*pix_next]; | |
| 6633 | |
| 4001 | 6634 if( FFABS( p0 - q0 ) < alpha && |
| 6635 FFABS( p1 - p0 ) < beta && | |
| 6636 FFABS( q1 - q0 ) < beta ) { | |
| 1898 | 6637 |
| 6638 const int p3 = pix[-4*pix_next]; | |
| 6639 const int q3 = pix[ 3*pix_next]; | |
| 6640 | |
| 4001 | 6641 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ |
| 6642 if( FFABS( p2 - p0 ) < beta) { | |
| 1898 | 6643 /* p0', p1', p2' */ |
| 6644 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6645 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6646 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6647 } else { | |
| 6648 /* p0' */ | |
| 6649 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6650 } | |
| 4001 | 6651 if( FFABS( q2 - q0 ) < beta) { |
| 1898 | 6652 /* q0', q1', q2' */ |
| 6653 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6654 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6655 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6656 } else { | |
| 6657 /* q0' */ | |
| 6658 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6659 } | |
| 6660 }else{ | |
| 6661 /* p0', q0' */ | |
| 6662 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6663 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6664 } | |
| 4600 | 6665 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
|
6666 } |
| 1898 | 6667 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
|
6668 } |
|
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 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6670 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6671 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6672 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
| 2834 | 6673 int i; |
|
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6674 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
|
6675 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
|
6676 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
|
6677 |
| 2633 | 6678 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
|
6679 int8_t tc[4]; |
| 2633 | 6680 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
|
6681 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
| 2633 | 6682 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); |
| 6683 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6684 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
|
6685 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6686 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6687 |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6688 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
|
6689 MpegEncContext * const s = &h->s; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6690 int mb_xy, mb_type; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6691 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6692 |
|
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
|
6693 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
|
6694 |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6695 if(mb_x==0 || mb_y==0 || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff || |
|
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
|
6696 (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
|
6697 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) { |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6698 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
|
6699 return; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6700 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6701 assert(!FRAME_MBAFF); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6702 |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6703 mb_type = s->current_picture.mb_type[mb_xy]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6704 qp = s->current_picture.qscale_table[mb_xy]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6705 qp0 = s->current_picture.qscale_table[mb_xy-1]; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6706 qp1 = s->current_picture.qscale_table[h->top_mb_xy]; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6707 qpc = get_chroma_qp( h, 0, qp ); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6708 qpc0 = get_chroma_qp( h, 0, qp0 ); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6709 qpc1 = get_chroma_qp( h, 0, qp1 ); |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6710 qp0 = (qp + qp0 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6711 qp1 = (qp + qp1 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6712 qpc0 = (qpc + qpc0 + 1) >> 1; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6713 qpc1 = (qpc + qpc1 + 1) >> 1; |
| 3651 | 6714 qp_thresh = 15 - h->slice_alpha_c0_offset; |
| 6715 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh && | |
| 6716 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh) | |
| 6717 return; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6718 |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6719 if( IS_INTRA(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6720 int16_t bS4[4] = {4,4,4,4}; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6721 int16_t bS3[4] = {3,3,3,3}; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6722 if( IS_8x8DCT(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6723 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6724 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6725 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 ); |
|
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 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6728 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6729 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6730 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6731 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6732 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6733 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6734 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6735 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6736 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6737 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6738 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6739 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6740 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6741 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bS4, qpc1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6742 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6743 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bS4, qpc1 ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6744 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6745 return; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6746 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6747 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6748 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS; |
| 3651 | 6749 int edges; |
| 6750 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) { | |
| 6751 edges = 4; | |
| 6752 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL; | |
| 6753 } else { | |
| 6754 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : | |
| 6755 (mb_type & MB_TYPE_16x8) ? 1 : 0; | |
| 6756 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
| 6757 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
| 6758 ? 3 : 0; | |
| 6759 int step = IS_8x8DCT(mb_type) ? 2 : 1; | |
| 6760 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; | |
| 6761 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache, | |
| 6762 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 ); | |
| 6763 } | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6764 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) ) |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6765 bSv[0][0] = 0x0004000400040004ULL; |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6766 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) ) |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6767 bSv[1][0] = 0x0004000400040004ULL; |
|
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 #define FILTER(hv,dir,edge)\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6770 if(bSv[dir][edge]) {\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6771 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
|
6772 if(!(edge&1)) {\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6773 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
|
6774 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
|
6775 }\ |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6776 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6777 if( edges == 1 ) { |
|
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(h,1,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6780 } else if( IS_8x8DCT(mb_type) ) { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6781 FILTER(v,0,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6782 FILTER(v,0,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6783 FILTER(h,1,0); |
|
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 } else { |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6786 FILTER(v,0,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6787 FILTER(v,0,1); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6788 FILTER(v,0,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6789 FILTER(v,0,3); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6790 FILTER(h,1,0); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6791 FILTER(h,1,1); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6792 FILTER(h,1,2); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6793 FILTER(h,1,3); |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6794 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6795 #undef FILTER |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6796 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6797 } |
|
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6798 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6799 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
|
6800 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
|
6801 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 3316 | 6802 const int mb_type = s->current_picture.mb_type[mb_xy]; |
| 6803 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
|
6804 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
|
6805 int dir; |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6806 /* 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
|
6807 * 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
|
6808 * frame numbers, not indices. */ |
| 3316 | 6809 static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, |
| 6810 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
|
6811 |
| 3101 | 6812 //for sufficiently low qp, filtering wouldn't do anything |
| 6813 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp | |
| 3316 | 6814 if(!FRAME_MBAFF){ |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6815 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, FFMAX(h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1])); |
| 3101 | 6816 int qp = s->current_picture.qscale_table[mb_xy]; |
| 6817 if(qp <= qp_thresh | |
| 6818 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh) | |
| 6819 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){ | |
| 6820 return; | |
| 6821 } | |
| 6822 } | |
| 6823 | |
| 3316 | 6824 if (FRAME_MBAFF |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6825 // left mb is in picture |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6826 && 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
|
6827 // and current and left pair do not have the same interlaced type |
| 3316 | 6828 && (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
|
6829 // 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
|
6830 && (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
|
6831 /* 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
|
6832 * 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
|
6833 */ |
| 3316 | 6834 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride; |
| 6835 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
|
6836 int16_t bS[8]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6837 int qp[2]; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6838 int bqp[2]; |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6839 int rqp[2]; |
| 3316 | 6840 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
|
6841 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6842 first_vertical_edge_done = 1; |
| 3316 | 6843 |
| 6844 if( IS_INTRA(mb_type) ) | |
| 6845 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4; | |
| 6846 else { | |
| 6847 for( i = 0; i < 8; i++ ) { | |
| 6848 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1]; | |
| 6849 | |
| 6850 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) | |
| 6851 bS[i] = 4; | |
| 6852 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || | |
| 6853 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ | |
| 6854 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) | |
| 6855 bS[i] = 2; | |
| 6856 else | |
| 6857 bS[i] = 1; | |
| 6858 } | |
| 6859 } | |
| 6860 | |
| 6861 mb_qp = s->current_picture.qscale_table[mb_xy]; | |
| 6862 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]]; | |
| 6863 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]]; | |
| 6864 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1; | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6865 bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) + |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6866 get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1; |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6867 rqp[0] = ( get_chroma_qp( h, 1, mb_qp ) + |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6868 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1; |
| 3316 | 6869 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6870 bqp[1] = ( get_chroma_qp( h, 0, mb_qp ) + |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6871 get_chroma_qp( h, 0, mbn1_qp ) + 1 ) >> 1; |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6872 rqp[1] = ( get_chroma_qp( h, 1, mb_qp ) + |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6873 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1; |
| 3316 | 6874 |
| 6875 /* Filter edge */ | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6876 tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize); |
| 4600 | 6877 { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } |
| 3316 | 6878 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp ); |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6879 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, bqp ); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6880 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, rqp ); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6881 } |
|
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
|
6882 /* 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
|
6883 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
|
6884 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6885 int edge; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6886 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
| 2924 | 6887 const int mbm_type = s->current_picture.mb_type[mbm_xy]; |
| 2454 | 6888 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
| 6889 | |
| 3101 | 6890 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP)) |
| 6891 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4; | |
| 2926 | 6892 // how often to recheck mv-based bS when iterating between edges |
| 6893 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 : | |
| 6894 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0; | |
| 6895 // how often to recheck mv-based bS when iterating along each edge | |
| 6896 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); | |
| 6897 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6898 if (first_vertical_edge_done) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6899 start = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6900 first_vertical_edge_done = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6901 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6902 |
| 2454 | 6903 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
|
6904 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
|
6905 |
| 3316 | 6906 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0 |
| 6907 && !IS_INTERLACED(mb_type) | |
| 6908 && IS_INTERLACED(mbm_type) | |
| 6909 ) { | |
| 6910 // This is a special case in the norm where the filtering must | |
| 6911 // be done twice (one each of the field) even if we are in a | |
| 6912 // frame macroblock. | |
| 6913 // | |
| 6914 static const int nnz_idx[4] = {4,5,6,3}; | |
| 6915 unsigned int tmp_linesize = 2 * linesize; | |
| 6916 unsigned int tmp_uvlinesize = 2 * uvlinesize; | |
| 6917 int mbn_xy = mb_xy - 2 * s->mb_stride; | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6918 int qp; |
| 3316 | 6919 int i, j; |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6920 int16_t bS[4]; |
| 3316 | 6921 |
| 6922 for(j=0; j<2; j++, mbn_xy += s->mb_stride){ | |
| 6923 if( IS_INTRA(mb_type) || | |
| 6924 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) { | |
| 6925 bS[0] = bS[1] = bS[2] = bS[3] = 3; | |
| 6926 } else { | |
| 6927 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy]; | |
| 6928 for( i = 0; i < 4; i++ ) { | |
| 6929 if( h->non_zero_count_cache[scan8[0]+i] != 0 || | |
| 6930 mbn_nnz[nnz_idx[i]] != 0 ) | |
| 6931 bS[i] = 2; | |
| 6932 else | |
| 6933 bS[i] = 1; | |
| 6934 } | |
| 6935 } | |
| 6936 // Do not use s->qscale as luma quantizer because it has not the same | |
| 6937 // value in IPCM macroblocks. | |
| 6938 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; | |
| 4600 | 6939 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); |
| 6940 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } | |
| 3316 | 6941 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp ); |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6942 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6943 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6944 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6945 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1); |
| 3316 | 6946 } |
| 6947 | |
| 6948 start = 1; | |
| 6949 } | |
| 6950 | |
|
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
|
6951 /* Calculate bS */ |
| 2924 | 6952 for( edge = start; edge < edges; edge++ ) { |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6953 /* mbn_xy: neighbor macroblock */ |
| 2924 | 6954 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
| 6955 const int mbn_type = s->current_picture.mb_type[mbn_xy]; | |
|
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6956 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
|
6957 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
|
6958 |
| 2924 | 6959 if( (edge&1) && IS_8x8DCT(mb_type) ) |
| 2755 | 6960 continue; |
| 6961 | |
| 2924 | 6962 if( IS_INTRA(mb_type) || |
| 6963 IS_INTRA(mbn_type) ) { | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6964 int value; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6965 if (edge == 0) { |
| 2924 | 6966 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type)) |
| 3316 | 6967 || ((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
|
6968 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6969 value = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6970 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6971 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6972 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6973 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6974 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6975 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6976 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
|
6977 } else { |
| 2924 | 6978 int i, l; |
| 6979 int mv_done; | |
| 6980 | |
| 6981 if( edge & mask_edge ) { | |
| 6982 bS[0] = bS[1] = bS[2] = bS[3] = 0; | |
| 6983 mv_done = 1; | |
| 6984 } | |
| 3316 | 6985 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) { |
| 6986 bS[0] = bS[1] = bS[2] = bS[3] = 1; | |
| 6987 mv_done = 1; | |
| 6988 } | |
| 2924 | 6989 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) { |
| 6990 int b_idx= 8 + 4 + edge * (dir ? 8:1); | |
| 6991 int bn_idx= b_idx - (dir ? 8:1); | |
| 6992 int v = 0; | |
| 6993 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
| 6994 v |= ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || | |
| 4001 | 6995 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 6996 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit; | |
| 2924 | 6997 } |
| 6998 bS[0] = bS[1] = bS[2] = bS[3] = v; | |
| 6999 mv_done = 1; | |
| 7000 } | |
| 7001 else | |
| 7002 mv_done = 0; | |
| 7003 | |
|
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
|
7004 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
|
7005 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
|
7006 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
|
7007 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
|
7008 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
|
7009 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7010 if( h->non_zero_count_cache[b_idx] != 0 || |
| 2449 | 7011 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
|
7012 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
|
7013 } |
| 2924 | 7014 else if(!mv_done) |
| 2523 | 7015 { |
| 7016 bS[i] = 0; | |
| 7017 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
|
7018 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
| 4001 | 7019 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 7020 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) { | |
| 2523 | 7021 bS[i] = 1; |
| 7022 break; | |
| 7023 } | |
| 7024 } | |
|
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
|
7025 } |
|
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 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7027 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7028 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
|
7029 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
|
7030 } |
|
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 |
|
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 edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7033 // 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
|
7034 // value in IPCM macroblocks. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
7035 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
| 4600 | 7036 //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]); |
| 7037 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); | |
| 7038 { 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
|
7039 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
|
7040 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 7041 if( (edge&1) == 0 ) { |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7042 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7043 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7044 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7045 ( h->chroma_qp[1] + get_chroma_qp( h, 1, 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
|
7046 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7047 } 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
|
7048 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 7049 if( (edge&1) == 0 ) { |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7050 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7051 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7052 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS, |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7053 ( h->chroma_qp[1] + get_chroma_qp( h, 1, 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
|
7054 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7055 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7056 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7057 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7058 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7059 |
| 1168 | 7060 static int decode_slice(H264Context *h){ |
| 7061 MpegEncContext * const s = &h->s; | |
| 7062 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 7063 | |
| 7064 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
|
7065 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7066 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
|
7067 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
|
7068 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7069 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7070 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
|
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 /* 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
|
7073 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
|
7074 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
|
7075 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 7076 ( 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
|
7077 /* calculate pre-state */ |
| 2755 | 7078 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
|
7079 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
|
7080 if( h->slice_type == I_TYPE ) |
| 4594 | 7081 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
|
7082 else |
| 4594 | 7083 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
|
7084 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7085 if( pre <= 63 ) |
|
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
7086 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
|
7087 else |
|
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
7088 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 7089 } |
| 7090 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7091 for(;;){ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
7092 //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
|
7093 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
|
7094 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
|
7095 //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
|
7096 |
| 2163 | 7097 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
|
7098 |
| 3316 | 7099 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
|
7100 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
|
7101 |
| 2163 | 7102 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
|
7103 |
|
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
7104 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
|
7105 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
|
7106 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7107 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
|
7108 |
|
3948
3edbf131ee44
refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents:
3947
diff
changeset
|
7109 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) { |
| 5153 | 7110 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
|
7111 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
|
7112 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
|
7113 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7114 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7115 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
|
7116 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
|
7117 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2392 | 7118 ++s->mb_y; |
| 3316 | 7119 if(FRAME_MBAFF) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7120 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7121 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7122 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7123 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7124 if( eos || s->mb_y >= s->mb_height ) { |
| 4600 | 7125 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
|
7126 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
|
7127 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
|
7128 } |
| 1168 | 7129 } |
|
1908
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 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7132 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7133 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
|
7134 |
| 2163 | 7135 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
|
7136 |
| 3316 | 7137 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
|
7138 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
|
7139 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
|
7140 |
| 2163 | 7141 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
|
7142 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
|
7143 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7144 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7145 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
|
7146 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
|
7147 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
|
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 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
|
7150 } |
|
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 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
|
7153 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
|
7154 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
|
7155 ++s->mb_y; |
| 3316 | 7156 if(FRAME_MBAFF) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7157 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7158 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7159 if(s->mb_y >= s->mb_height){ |
| 4600 | 7160 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
|
7161 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7162 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
|
7163 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
|
7164 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7165 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
|
7166 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7167 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
|
7168 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7169 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
|
7170 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7171 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7172 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7173 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7174 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
| 4600 | 7175 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
|
7176 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 7177 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); |
| 7178 | |
| 7179 return 0; | |
| 7180 }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
|
7181 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 | 7182 |
| 7183 return -1; | |
| 7184 } | |
| 7185 } | |
| 7186 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7187 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7188 |
| 1168 | 7189 #if 0 |
| 7190 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 7191 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 7192 int ret= decode_mb(h); | |
| 2967 | 7193 |
| 1168 | 7194 hl_decode_mb(h); |
| 7195 | |
| 7196 if(ret<0){ | |
| 3177 | 7197 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 7198 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); |
| 7199 | |
| 7200 return -1; | |
| 7201 } | |
| 2967 | 7202 |
| 1168 | 7203 if(++s->mb_x >= s->mb_width){ |
| 7204 s->mb_x=0; | |
| 7205 if(++s->mb_y >= s->mb_height){ | |
| 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_END|DC_END|MV_END)&part_mask); | |
| 7212 | |
| 7213 return -1; | |
| 7214 } | |
| 7215 } | |
| 7216 } | |
| 2967 | 7217 |
| 1168 | 7218 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ |
| 7219 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 7220 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); | |
| 7221 | |
| 7222 return 0; | |
| 7223 }else{ | |
| 7224 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); | |
| 7225 | |
| 7226 return -1; | |
| 7227 } | |
| 7228 } | |
| 7229 } | |
| 7230 s->mb_x=0; | |
| 7231 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 7232 } | |
| 7233 #endif | |
| 7234 return -1; //not reached | |
| 7235 } | |
| 7236 | |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7237 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
|
7238 MpegEncContext * const s = &h->s; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7239 uint8_t user_data[16+256]; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7240 int e, build, i; |
| 2967 | 7241 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7242 if(size<16) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7243 return -1; |
| 2967 | 7244 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7245 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
|
7246 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
|
7247 } |
| 2967 | 7248 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7249 user_data[i]= 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7250 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
|
7251 if(e==1 && build>=0) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7252 h->x264_build= build; |
| 2967 | 7253 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7254 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
|
7255 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
|
7256 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7257 for(; i<size; i++) |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7258 skip_bits(&s->gb, 8); |
| 2967 | 7259 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7260 return 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7261 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7262 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7263 static int decode_sei(H264Context *h){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7264 MpegEncContext * const s = &h->s; |
| 2967 | 7265 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7266 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
|
7267 int size, type; |
| 2967 | 7268 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7269 type=0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7270 do{ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7271 type+= show_bits(&s->gb, 8); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7272 }while(get_bits(&s->gb, 8) == 255); |
| 2967 | 7273 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7274 size=0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7275 do{ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7276 size+= show_bits(&s->gb, 8); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7277 }while(get_bits(&s->gb, 8) == 255); |
| 2967 | 7278 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7279 switch(type){ |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7280 case 5: |
| 3318 | 7281 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
|
7282 return -1; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7283 break; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7284 default: |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7285 skip_bits(&s->gb, 8*size); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7286 } |
| 2967 | 7287 |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7288 //FIXME check bits here |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7289 align_get_bits(&s->gb); |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7290 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7291 |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7292 return 0; |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7293 } |
|
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7294 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7295 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
|
7296 MpegEncContext * const s = &h->s; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7297 int cpb_count, i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7298 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
|
7299 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
|
7300 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
|
7301 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
|
7302 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
|
7303 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
|
7304 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
|
7305 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7306 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
|
7307 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
|
7308 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
|
7309 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
|
7310 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7311 |
| 1168 | 7312 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
| 7313 MpegEncContext * const s = &h->s; | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7314 int aspect_ratio_info_present_flag; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7315 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
|
7316 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
| 1168 | 7317 |
| 7318 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 2967 | 7319 |
| 1168 | 7320 if( aspect_ratio_info_present_flag ) { |
| 7321 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 7322 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 7323 sps->sar.num= get_bits(&s->gb, 16); |
| 7324 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
|
7325 }else if(aspect_ratio_idc < 14){ |
| 1548 | 7326 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 7327 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7328 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 7329 return -1; |
| 7330 } | |
| 7331 }else{ | |
| 2967 | 7332 sps->sar.num= |
| 1548 | 7333 sps->sar.den= 0; |
| 1168 | 7334 } |
| 7335 // 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
|
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 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
|
7338 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
|
7339 } |
|
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 |
|
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 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
|
7342 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
|
7343 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
|
7344 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
|
7345 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
|
7346 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
|
7347 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
|
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 } |
|
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
|
7350 |
|
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
|
7351 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
|
7352 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
|
7353 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
|
7354 } |
|
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
|
7355 |
|
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
|
7356 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
|
7357 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
|
7358 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
|
7359 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
|
7360 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
|
7361 } |
|
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
|
7362 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7363 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
|
7364 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
|
7365 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7366 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
|
7367 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
|
7368 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7369 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
|
7370 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
|
7371 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
|
7372 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7373 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
|
7374 if(sps->bitstream_restriction_flag){ |
| 4389 | 7375 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
|
7376 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
|
7377 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
|
7378 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
|
7379 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
|
7380 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */ |
| 4389 | 7381 num_reorder_frames= get_ue_golomb(&s->gb); |
| 7382 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/ | |
| 7383 | |
| 7384 if(num_reorder_frames > 16 /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){ | |
| 7385 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", num_reorder_frames); | |
| 7386 return -1; | |
| 7387 } | |
| 7388 | |
| 7389 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
|
7390 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7391 |
| 1168 | 7392 return 0; |
| 7393 } | |
| 7394 | |
| 3004 | 7395 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, |
| 7396 const uint8_t *jvt_list, const uint8_t *fallback_list){ | |
| 2919 | 7397 MpegEncContext * const s = &h->s; |
| 7398 int i, last = 8, next = 8; | |
| 7399 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; | |
| 3004 | 7400 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ |
| 7401 memcpy(factors, fallback_list, size*sizeof(uint8_t)); | |
| 2919 | 7402 else |
| 7403 for(i=0;i<size;i++){ | |
| 7404 if(next) | |
| 7405 next = (last + get_se_golomb(&s->gb)) & 0xff; | |
| 3004 | 7406 if(!i && !next){ /* matrix not written, we use the preset one */ |
| 7407 memcpy(factors, jvt_list, size*sizeof(uint8_t)); | |
| 2919 | 7408 break; |
| 7409 } | |
| 7410 last = factors[scan[i]] = next ? next : last; | |
| 7411 } | |
| 7412 } | |
| 7413 | |
| 7414 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps, | |
| 7415 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){ | |
| 7416 MpegEncContext * const s = &h->s; | |
| 7417 int fallback_sps = !is_sps && sps->scaling_matrix_present; | |
| 7418 const uint8_t *fallback[4] = { | |
| 7419 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0], | |
| 7420 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1], | |
| 7421 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0], | |
| 7422 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1] | |
| 7423 }; | |
| 7424 if(get_bits1(&s->gb)){ | |
| 7425 sps->scaling_matrix_present |= is_sps; | |
| 3004 | 7426 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y |
| 7427 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr | |
| 7428 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb | |
| 7429 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y | |
| 7430 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr | |
| 7431 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb | |
| 2919 | 7432 if(is_sps || pps->transform_8x8_mode){ |
| 3004 | 7433 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y |
| 7434 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y | |
| 2919 | 7435 } |
| 7436 } else if(fallback_sps) { | |
| 7437 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t)); | |
| 7438 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t)); | |
| 7439 } | |
| 7440 } | |
| 7441 | |
| 5079 | 7442 /** |
| 7443 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec' | |
| 7444 */ | |
| 7445 static void * | |
| 7446 alloc_parameter_set(H264Context *h, void **vec, const unsigned int id, const unsigned int max, | |
| 7447 const size_t size, const char *name) | |
| 7448 { | |
| 7449 if(id>=max) { | |
| 7450 av_log(h->s.avctx, AV_LOG_ERROR, "%s_id (%d) out of range\n", name, id); | |
| 7451 return NULL; | |
| 7452 } | |
| 7453 | |
| 7454 if(!vec[id]) { | |
| 7455 vec[id] = av_mallocz(size); | |
| 7456 if(vec[id] == NULL) | |
| 7457 av_log(h->s.avctx, AV_LOG_ERROR, "cannot allocate memory for %s\n", name); | |
| 7458 } | |
| 7459 return vec[id]; | |
| 7460 } | |
| 7461 | |
| 1168 | 7462 static inline int decode_seq_parameter_set(H264Context *h){ |
| 7463 MpegEncContext * const s = &h->s; | |
| 1371 | 7464 int profile_idc, level_idc; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7465 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
|
7466 int i; |
| 1168 | 7467 SPS *sps; |
| 2967 | 7468 |
| 1168 | 7469 profile_idc= get_bits(&s->gb, 8); |
| 1371 | 7470 get_bits1(&s->gb); //constraint_set0_flag |
| 7471 get_bits1(&s->gb); //constraint_set1_flag | |
| 7472 get_bits1(&s->gb); //constraint_set2_flag | |
| 2312 | 7473 get_bits1(&s->gb); //constraint_set3_flag |
| 7474 get_bits(&s->gb, 4); // reserved | |
| 1168 | 7475 level_idc= get_bits(&s->gb, 8); |
| 7476 sps_id= get_ue_golomb(&s->gb); | |
| 2967 | 7477 |
| 5079 | 7478 sps = alloc_parameter_set(h, (void **)h->sps_buffers, sps_id, MAX_SPS_COUNT, sizeof(SPS), "sps"); |
| 7479 if(sps == NULL) | |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7480 return -1; |
| 5079 | 7481 |
| 1168 | 7482 sps->profile_idc= profile_idc; |
| 7483 sps->level_idc= level_idc; | |
| 2312 | 7484 |
| 2755 | 7485 if(sps->profile_idc >= 100){ //high profile |
| 7486 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc | |
| 7487 get_bits1(&s->gb); //residual_color_transform_flag | |
| 7488 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
| 7489 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
| 2763 | 7490 sps->transform_bypass = get_bits1(&s->gb); |
| 2919 | 7491 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8); |
| 7492 }else | |
| 7493 sps->scaling_matrix_present = 0; | |
| 2755 | 7494 |
| 1168 | 7495 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
| 7496 sps->poc_type= get_ue_golomb(&s->gb); | |
| 2967 | 7497 |
| 1168 | 7498 if(sps->poc_type == 0){ //FIXME #define |
| 7499 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 7500 } else if(sps->poc_type == 1){//FIXME #define | |
| 7501 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 7502 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 7503 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
|
7504 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7505 |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7506 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
|
7507 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
|
7508 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7509 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7510 sps->poc_cycle_length= tmp; |
| 2967 | 7511 |
| 1168 | 7512 for(i=0; i<sps->poc_cycle_length; i++) |
| 7513 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
|
7514 }else if(sps->poc_type != 2){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7515 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 7516 return -1; |
| 7517 } | |
| 7518 | |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7519 tmp= get_ue_golomb(&s->gb); |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7520 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
|
7521 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
|
7522 } |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7523 sps->ref_frame_count= tmp; |
| 1371 | 7524 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
|
7525 mb_width= get_ue_golomb(&s->gb) + 1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7526 mb_height= get_ue_golomb(&s->gb) + 1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7527 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 || |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7528 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){ |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7529 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n"); |
| 2422 | 7530 return -1; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7531 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7532 sps->mb_width = mb_width; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7533 sps->mb_height= mb_height; |
| 2422 | 7534 |
| 1168 | 7535 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
| 7536 if(!sps->frame_mbs_only_flag) | |
| 7537 sps->mb_aff= get_bits1(&s->gb); | |
| 7538 else | |
| 7539 sps->mb_aff= 0; | |
| 7540 | |
| 7541 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 7542 | |
| 3316 | 7543 #ifndef ALLOW_INTERLACE |
| 7544 if(sps->mb_aff) | |
| 3954 | 7545 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n"); |
| 3316 | 7546 #endif |
| 7547 if(!sps->direct_8x8_inference_flag && sps->mb_aff) | |
| 7548 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); | |
| 7549 | |
| 1371 | 7550 sps->crop= get_bits1(&s->gb); |
| 7551 if(sps->crop){ | |
| 7552 sps->crop_left = get_ue_golomb(&s->gb); | |
| 7553 sps->crop_right = get_ue_golomb(&s->gb); | |
| 7554 sps->crop_top = get_ue_golomb(&s->gb); | |
| 7555 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 7556 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
|
7557 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
| 1371 | 7558 } |
| 7559 }else{ | |
| 2967 | 7560 sps->crop_left = |
| 7561 sps->crop_right = | |
| 7562 sps->crop_top = | |
| 1371 | 7563 sps->crop_bottom= 0; |
| 7564 } | |
| 7565 | |
| 1168 | 7566 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 7567 if( sps->vui_parameters_present_flag ) | |
| 7568 decode_vui_parameters(h, sps); | |
| 2967 | 7569 |
| 1168 | 7570 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
|
7571 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 | 7572 sps_id, sps->profile_idc, sps->level_idc, |
| 7573 sps->poc_type, | |
| 7574 sps->ref_frame_count, | |
| 7575 sps->mb_width, sps->mb_height, | |
| 7576 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 7577 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 2967 | 7578 sps->crop_left, sps->crop_right, |
| 7579 sps->crop_top, sps->crop_bottom, | |
| 1168 | 7580 sps->vui_parameters_present_flag ? "VUI" : "" |
| 7581 ); | |
| 7582 } | |
| 7583 return 0; | |
| 7584 } | |
| 7585 | |
|
5226
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7586 static void |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7587 build_qp_table(PPS *pps, int t, int index) |
|
5226
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7588 { |
|
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7589 int i; |
|
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7590 for(i = 0; i < 255; i++) |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7591 pps->chroma_qp_table[t][i & 0xff] = chroma_qp[av_clip(i + index, 0, 51)]; |
|
5226
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7592 } |
|
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7593 |
| 2755 | 7594 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
| 1168 | 7595 MpegEncContext * const s = &h->s; |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7596 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
|
7597 PPS *pps; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7598 |
| 5079 | 7599 pps = alloc_parameter_set(h, (void **)h->pps_buffers, pps_id, MAX_PPS_COUNT, sizeof(PPS), "pps"); |
| 7600 if(pps == NULL) | |
|
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7601 return -1; |
| 2967 | 7602 |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7603 tmp= get_ue_golomb(&s->gb); |
| 5079 | 7604 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){ |
|
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7605 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
|
7606 return -1; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7607 } |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7608 pps->sps_id= tmp; |
|
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7609 |
| 1168 | 7610 pps->cabac= get_bits1(&s->gb); |
| 7611 pps->pic_order_present= get_bits1(&s->gb); | |
| 7612 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 7613 if(pps->slice_group_count > 1 ){ | |
| 7614 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
|
7615 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 7616 switch(pps->mb_slice_group_map_type){ |
| 7617 case 0: | |
| 7618 #if 0 | |
| 7619 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 7620 | run_length[ i ] |1 |ue(v) | | |
| 7621 #endif | |
| 7622 break; | |
| 7623 case 2: | |
| 7624 #if 0 | |
| 7625 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 7626 |{ | | | | |
| 7627 | top_left_mb[ i ] |1 |ue(v) | | |
| 7628 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 7629 | } | | | | |
| 7630 #endif | |
| 7631 break; | |
| 7632 case 3: | |
| 7633 case 4: | |
| 7634 case 5: | |
| 7635 #if 0 | |
| 7636 | slice_group_change_direction_flag |1 |u(1) | | |
| 7637 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 7638 #endif | |
| 7639 break; | |
| 7640 case 6: | |
| 7641 #if 0 | |
| 7642 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 7643 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 7644 |) | | | | |
| 7645 | slice_group_id[ i ] |1 |u(v) | | |
| 7646 #endif | |
| 1214 | 7647 break; |
| 1168 | 7648 } |
| 7649 } | |
| 7650 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 7651 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4531 | 7652 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
|
7653 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
|
7654 pps->ref_count[0]= pps->ref_count[1]= 1; |
| 1168 | 7655 return -1; |
| 7656 } | |
| 2967 | 7657 |
| 1168 | 7658 pps->weighted_pred= get_bits1(&s->gb); |
| 7659 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 7660 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 7661 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7662 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb); |
| 1168 | 7663 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); |
| 7664 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 7665 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 2967 | 7666 |
|
3291
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7667 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
|
7668 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit |
| 2919 | 7669 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t)); |
| 7670 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
| 2755 | 7671 |
| 7672 if(get_bits_count(&s->gb) < bit_length){ | |
| 7673 pps->transform_8x8_mode= get_bits1(&s->gb); | |
| 5079 | 7674 decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8); |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7675 pps->chroma_qp_index_offset[1]= get_se_golomb(&s->gb); //second_chroma_qp_index_offset |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7676 } else { |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7677 pps->chroma_qp_index_offset[1]= pps->chroma_qp_index_offset[0]; |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7678 } |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7679 |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7680 build_qp_table(pps, 0, pps->chroma_qp_index_offset[0]); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7681 if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1]) { |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7682 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]); |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7683 h->pps.chroma_qp_diff= 1; |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7684 } else |
|
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7685 memcpy(pps->chroma_qp_table[1], pps->chroma_qp_table[0], 256); |
| 2967 | 7686 |
| 1168 | 7687 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7688 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n", |
| 1168 | 7689 pps_id, pps->sps_id, |
| 7690 pps->cabac ? "CABAC" : "CAVLC", | |
| 7691 pps->slice_group_count, | |
| 7692 pps->ref_count[0], pps->ref_count[1], | |
| 7693 pps->weighted_pred ? "weighted" : "", | |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7694 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset[0], pps->chroma_qp_index_offset[1], |
| 1168 | 7695 pps->deblocking_filter_parameters_present ? "LPAR" : "", |
| 7696 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 2755 | 7697 pps->redundant_pic_cnt_present ? "REDU" : "", |
| 7698 pps->transform_8x8_mode ? "8x8DCT" : "" | |
| 1168 | 7699 ); |
| 7700 } | |
| 2967 | 7701 |
| 1168 | 7702 return 0; |
| 7703 } | |
| 7704 | |
| 7705 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ | |
| 7706 MpegEncContext * const s = &h->s; | |
| 7707 AVCodecContext * const avctx= s->avctx; | |
| 7708 int buf_index=0; | |
| 1322 | 7709 #if 0 |
| 1168 | 7710 int i; |
|
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7711 for(i=0; i<50; i++){ |
|
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7712 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]); |
| 1168 | 7713 } |
| 7714 #endif | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7715 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
|
7716 h->slice_num = 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7717 s->current_picture_ptr= NULL; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7718 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7719 |
| 1168 | 7720 for(;;){ |
| 7721 int consumed; | |
| 7722 int dst_length; | |
| 7723 int bit_length; | |
| 7724 uint8_t *ptr; | |
| 2227 | 7725 int i, nalsize = 0; |
| 2967 | 7726 |
| 5170 | 7727 if(h->is_avc) { |
| 7728 if(buf_index >= buf_size) break; | |
| 7729 nalsize = 0; | |
| 7730 for(i = 0; i < h->nal_length_size; i++) | |
| 7731 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 7732 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ | |
| 7733 if(nalsize == 1){ | |
| 7734 buf_index++; | |
| 7735 continue; | |
| 7736 }else{ | |
| 7737 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); | |
| 7738 break; | |
| 7739 } | |
| 7740 } | |
| 7741 } else { | |
| 7742 // start code prefix search | |
| 7743 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 7744 // This should always succeed in the first iteration. | |
| 7745 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 7746 break; | |
| 7747 } | |
| 7748 | |
| 7749 if(buf_index+3 >= buf_size) break; | |
| 7750 | |
| 7751 buf_index+=3; | |
| 7752 } | |
| 2967 | 7753 |
|
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
7754 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
|
7755 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
|
7756 return -1; |
|
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7757 } |
|
4829
e3161603a048
Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents:
4828
diff
changeset
|
7758 while(ptr[dst_length - 1] == 0 && dst_length > 0) |
| 3341 | 7759 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
|
7760 bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1)); |
| 1168 | 7761 |
| 7762 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
7763 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 | 7764 } |
| 2967 | 7765 |
| 2227 | 7766 if (h->is_avc && (nalsize != consumed)) |
| 7767 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 7768 | |
| 1168 | 7769 buf_index += consumed; |
| 7770 | |
| 5127 | 7771 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME do not discard SEI id |
| 2792 | 7772 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
| 1168 | 7773 continue; |
| 2967 | 7774 |
| 1168 | 7775 switch(h->nal_unit_type){ |
| 7776 case NAL_IDR_SLICE: | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7777 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
| 1168 | 7778 case NAL_SLICE: |
| 7779 init_get_bits(&s->gb, ptr, bit_length); | |
| 7780 h->intra_gb_ptr= | |
| 7781 h->inter_gb_ptr= &s->gb; | |
| 7782 s->data_partitioning = 0; | |
| 2967 | 7783 |
| 2771 | 7784 if(decode_slice_header(h) < 0){ |
| 7785 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7786 break; | |
| 7787 } | |
|
3161
e3e94632c6e9
keyframe flag was wrong if SEIs followed the keyframe
lorenm
parents:
3145
diff
changeset
|
7788 s->current_picture_ptr->key_frame= (h->nal_unit_type == NAL_IDR_SLICE); |
| 2967 | 7789 if(h->redundant_pic_count==0 && s->hurry_up < 5 |
| 2793 | 7790 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) |
| 7791 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
| 7792 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
| 7793 && avctx->skip_frame < AVDISCARD_ALL) | |
| 1168 | 7794 decode_slice(h); |
| 7795 break; | |
| 7796 case NAL_DPA: | |
| 7797 init_get_bits(&s->gb, ptr, bit_length); | |
| 7798 h->intra_gb_ptr= | |
| 7799 h->inter_gb_ptr= NULL; | |
| 7800 s->data_partitioning = 1; | |
| 2967 | 7801 |
| 2771 | 7802 if(decode_slice_header(h) < 0){ |
| 7803 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7804 } | |
| 1168 | 7805 break; |
| 7806 case NAL_DPB: | |
| 7807 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 7808 h->intra_gb_ptr= &h->intra_gb; | |
| 7809 break; | |
| 7810 case NAL_DPC: | |
| 7811 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 7812 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 7813 |
| 2967 | 7814 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
|
7815 && s->context_initialized |
| 2793 | 7816 && s->hurry_up < 5 |
| 7817 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) | |
| 7818 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
| 7819 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
| 7820 && avctx->skip_frame < AVDISCARD_ALL) | |
| 1168 | 7821 decode_slice(h); |
| 7822 break; | |
| 7823 case NAL_SEI: | |
|
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7824 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
|
7825 decode_sei(h); |
| 1168 | 7826 break; |
| 7827 case NAL_SPS: | |
| 7828 init_get_bits(&s->gb, ptr, bit_length); | |
| 7829 decode_seq_parameter_set(h); | |
| 2967 | 7830 |
| 1168 | 7831 if(s->flags& CODEC_FLAG_LOW_DELAY) |
| 7832 s->low_delay=1; | |
| 2967 | 7833 |
| 2538 | 7834 if(avctx->has_b_frames < 2) |
| 7835 avctx->has_b_frames= !s->low_delay; | |
| 1168 | 7836 break; |
| 7837 case NAL_PPS: | |
| 7838 init_get_bits(&s->gb, ptr, bit_length); | |
| 2967 | 7839 |
| 2755 | 7840 decode_picture_parameter_set(h, bit_length); |
| 1168 | 7841 |
| 7842 break; | |
| 2960 | 7843 case NAL_AUD: |
| 7844 case NAL_END_SEQUENCE: | |
| 7845 case NAL_END_STREAM: | |
| 7846 case NAL_FILLER_DATA: | |
| 7847 case NAL_SPS_EXT: | |
| 7848 case NAL_AUXILIARY_SLICE: | |
| 1168 | 7849 break; |
| 2979 | 7850 default: |
| 7851 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 2967 | 7852 } |
| 7853 } | |
| 7854 | |
| 1168 | 7855 return buf_index; |
| 7856 } | |
| 7857 | |
| 7858 /** | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7859 * returns the number of bytes consumed for building the current frame |
| 1168 | 7860 */ |
| 7861 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 7862 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 7863 pos -= s->parse_context.last_index; | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7864 if(pos<0) pos=0; // FIXME remove (unneeded?) |
| 2967 | 7865 |
| 1168 | 7866 return pos; |
| 7867 }else{ | |
| 5127 | 7868 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
| 1168 | 7869 if(pos+10>buf_size) pos=buf_size; // oops ;) |
| 7870 | |
| 7871 return pos; | |
| 7872 } | |
| 7873 } | |
| 7874 | |
| 2967 | 7875 static int decode_frame(AVCodecContext *avctx, |
| 1168 | 7876 void *data, int *data_size, |
| 7877 uint8_t *buf, int buf_size) | |
| 7878 { | |
| 7879 H264Context *h = avctx->priv_data; | |
| 7880 MpegEncContext *s = &h->s; | |
| 2967 | 7881 AVFrame *pict = data; |
| 1168 | 7882 int buf_index; |
| 2967 | 7883 |
| 1168 | 7884 s->flags= avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
7885 s->flags2= avctx->flags2; |
| 1168 | 7886 |
| 7887 /* no supplementary picture */ | |
| 7888 if (buf_size == 0) { | |
| 4556 | 7889 Picture *out; |
| 7890 int i, out_idx; | |
| 7891 | |
| 7892 //FIXME factorize this with the output code below | |
| 7893 out = h->delayed_pic[0]; | |
| 7894 out_idx = 0; | |
| 7895 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) | |
| 7896 if(h->delayed_pic[i]->poc < out->poc){ | |
| 7897 out = h->delayed_pic[i]; | |
| 7898 out_idx = i; | |
| 7899 } | |
| 7900 | |
| 7901 for(i=out_idx; h->delayed_pic[i]; i++) | |
| 7902 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
| 7903 | |
| 7904 if(out){ | |
| 7905 *data_size = sizeof(AVFrame); | |
| 7906 *pict= *(AVFrame*)out; | |
| 7907 } | |
| 7908 | |
| 1168 | 7909 return 0; |
| 7910 } | |
| 2967 | 7911 |
| 1168 | 7912 if(s->flags&CODEC_FLAG_TRUNCATED){ |
| 4975 | 7913 int next= ff_h264_find_frame_end(h, buf, buf_size); |
| 2967 | 7914 |
|
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4908
diff
changeset
|
7915 if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 ) |
| 1168 | 7916 return buf_size; |
| 7917 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 7918 } | |
| 7919 | |
| 2227 | 7920 if(h->is_avc && !h->got_avcC) { |
| 7921 int i, cnt, nalsize; | |
| 7922 unsigned char *p = avctx->extradata; | |
| 7923 if(avctx->extradata_size < 7) { | |
| 7924 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 7925 return -1; | |
| 7926 } | |
| 7927 if(*p != 1) { | |
| 7928 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 7929 return -1; | |
| 7930 } | |
| 7931 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 7932 so put a fake nal_length_size = 2 while parsing them */ | |
| 7933 h->nal_length_size = 2; | |
| 7934 // Decode sps from avcC | |
| 7935 cnt = *(p+5) & 0x1f; // Number of sps | |
| 7936 p += 6; | |
| 7937 for (i = 0; i < cnt; i++) { | |
| 4364 | 7938 nalsize = AV_RB16(p) + 2; |
|
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7939 if(decode_nal_units(h, p, nalsize) < 0) { |
| 2227 | 7940 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
| 7941 return -1; | |
| 7942 } | |
| 7943 p += nalsize; | |
| 2967 | 7944 } |
| 2227 | 7945 // Decode pps from avcC |
| 7946 cnt = *(p++); // Number of pps | |
| 7947 for (i = 0; i < cnt; i++) { | |
| 4364 | 7948 nalsize = AV_RB16(p) + 2; |
| 2227 | 7949 if(decode_nal_units(h, p, nalsize) != nalsize) { |
| 7950 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 7951 return -1; | |
| 7952 } | |
| 7953 p += nalsize; | |
| 2967 | 7954 } |
| 2227 | 7955 // Now store right nal length size, that will be use to parse all other nals |
| 7956 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 7957 // Do not reparse avcC | |
| 7958 h->got_avcC = 1; | |
| 7959 } | |
| 7960 | |
|
4507
b80c704183e9
always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents:
4391
diff
changeset
|
7961 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){ |
| 2967 | 7962 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) |
| 1168 | 7963 return -1; |
| 7964 } | |
| 7965 | |
| 7966 buf_index=decode_nal_units(h, buf, buf_size); | |
| 2967 | 7967 if(buf_index < 0) |
| 1168 | 7968 return -1; |
| 7969 | |
| 4620 | 7970 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ |
| 7971 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); | |
| 7972 return -1; | |
| 7973 } | |
| 7974 | |
|
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7975 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
|
7976 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
|
7977 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
|
7978 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
|
7979 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
|
7980 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7981 s->mb_y= 0; |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7982 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7983 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
|
7984 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
|
7985 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7986 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
|
7987 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
|
7988 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
|
7989 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
|
7990 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
|
7991 } |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7992 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
|
7993 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
|
7994 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7995 ff_er_frame_end(s); |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7996 |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7997 MPV_frame_end(s); |
|
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7998 |
| 2967 | 7999 //FIXME do something with unavailable reference frames |
| 8000 | |
| 2561 | 8001 #if 0 //decode order |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8002 *data_size = sizeof(AVFrame); |
| 2561 | 8003 #else |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8004 /* 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
|
8005 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8006 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
|
8007 && 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
|
8008 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
|
8009 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8010 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8011 |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8012 pics = 0; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8013 while(h->delayed_pic[pics]) pics++; |
| 4388 | 8014 |
| 8015 assert(pics+1 < sizeof(h->delayed_pic) / sizeof(h->delayed_pic[0])); | |
| 8016 | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8017 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
|
8018 if(cur->reference == 0) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8019 cur->reference = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8020 |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8021 cross_idr = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8022 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
|
8023 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
|
8024 cross_idr = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8025 |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8026 out = h->delayed_pic[0]; |
|
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8027 out_idx = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8028 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
|
8029 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
|
8030 out = h->delayed_pic[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8031 out_idx = i; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8032 } |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8033 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8034 out_of_order = !cross_idr && prev && out->poc < prev->poc; |
| 3125 | 8035 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
| 8036 { } | |
| 8037 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
|
8038 out = prev; |
| 2923 | 8039 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) |
| 2967 | 8040 || (s->low_delay && |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8041 ((!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
|
8042 || cur->pict_type == B_TYPE))) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8043 { |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8044 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8045 s->avctx->has_b_frames++; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8046 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8047 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8048 else if(out_of_order) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8049 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8050 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8051 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
|
8052 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
|
8053 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
|
8054 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8055 |
|
3297
9ae9653d706c
decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents:
3291
diff
changeset
|
8056 if(prev == out) |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8057 *data_size = 0; |
| 2561 | 8058 else |
| 8059 *data_size = sizeof(AVFrame); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8060 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
|
8061 prev->reference = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8062 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
|
8063 #endif |
| 2409 | 8064 |
| 2937 | 8065 if(out) |
| 8066 *pict= *(AVFrame*)out; | |
| 8067 else | |
| 8068 av_log(avctx, AV_LOG_DEBUG, "no picture\n"); | |
| 8069 } | |
| 8070 | |
| 8071 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
|
8072 ff_print_debug_info(s, pict); |
| 1168 | 8073 //printf("out %d\n", (int)pict->data[0]); |
| 8074 #if 0 //? | |
| 8075 | |
| 8076 /* Return the Picture timestamp as the frame number */ | |
| 8077 /* we substract 1 because it is added on utils.c */ | |
| 8078 avctx->frame_number = s->picture_number - 1; | |
| 8079 #endif | |
| 8080 return get_consumed_bytes(s, buf_index, buf_size); | |
| 8081 } | |
| 8082 #if 0 | |
| 8083 static inline void fill_mb_avail(H264Context *h){ | |
| 8084 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
|
8085 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 8086 |
| 8087 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
|
8088 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
|
8089 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
|
8090 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 8091 }else{ |
| 8092 h->mb_avail[0]= | |
| 8093 h->mb_avail[1]= | |
| 8094 h->mb_avail[2]= 0; | |
| 8095 } | |
| 8096 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 8097 h->mb_avail[4]= 1; //FIXME move out | |
| 8098 h->mb_avail[5]= 0; //FIXME move out | |
| 8099 } | |
| 8100 #endif | |
| 8101 | |
| 8102 #if 0 //selftest | |
| 8103 #define COUNT 8000 | |
| 8104 #define SIZE (COUNT*40) | |
| 8105 int main(){ | |
| 8106 int i; | |
| 8107 uint8_t temp[SIZE]; | |
| 8108 PutBitContext pb; | |
| 8109 GetBitContext gb; | |
| 8110 // int int_temp[10000]; | |
| 8111 DSPContext dsp; | |
| 8112 AVCodecContext avctx; | |
| 2967 | 8113 |
| 1168 | 8114 dsputil_init(&dsp, &avctx); |
| 8115 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
8116 init_put_bits(&pb, temp, SIZE); |
| 1168 | 8117 printf("testing unsigned exp golomb\n"); |
| 8118 for(i=0; i<COUNT; i++){ | |
| 8119 START_TIMER | |
| 8120 set_ue_golomb(&pb, i); | |
| 8121 STOP_TIMER("set_ue_golomb"); | |
| 8122 } | |
| 8123 flush_put_bits(&pb); | |
| 2967 | 8124 |
| 1168 | 8125 init_get_bits(&gb, temp, 8*SIZE); |
| 8126 for(i=0; i<COUNT; i++){ | |
| 8127 int j, s; | |
| 2967 | 8128 |
| 1168 | 8129 s= show_bits(&gb, 24); |
| 2967 | 8130 |
| 1168 | 8131 START_TIMER |
| 8132 j= get_ue_golomb(&gb); | |
| 8133 if(j != i){ | |
| 5127 | 8134 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
| 1168 | 8135 // return -1; |
| 8136 } | |
| 8137 STOP_TIMER("get_ue_golomb"); | |
| 8138 } | |
| 2967 | 8139 |
| 8140 | |
| 1524 | 8141 init_put_bits(&pb, temp, SIZE); |
| 1168 | 8142 printf("testing signed exp golomb\n"); |
| 8143 for(i=0; i<COUNT; i++){ | |
| 8144 START_TIMER | |
| 8145 set_se_golomb(&pb, i - COUNT/2); | |
| 8146 STOP_TIMER("set_se_golomb"); | |
| 8147 } | |
| 8148 flush_put_bits(&pb); | |
| 2967 | 8149 |
| 1168 | 8150 init_get_bits(&gb, temp, 8*SIZE); |
| 8151 for(i=0; i<COUNT; i++){ | |
| 8152 int j, s; | |
| 2967 | 8153 |
| 1168 | 8154 s= show_bits(&gb, 24); |
| 2967 | 8155 |
| 1168 | 8156 START_TIMER |
| 8157 j= get_se_golomb(&gb); | |
| 8158 if(j != i - COUNT/2){ | |
| 5127 | 8159 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
| 1168 | 8160 // return -1; |
| 8161 } | |
| 8162 STOP_TIMER("get_se_golomb"); | |
| 8163 } | |
| 8164 | |
| 8165 printf("testing 4x4 (I)DCT\n"); | |
| 2967 | 8166 |
| 1168 | 8167 DCTELEM block[16]; |
| 8168 uint8_t src[16], ref[16]; | |
| 8169 uint64_t error= 0, max_error=0; | |
| 8170 | |
| 8171 for(i=0; i<COUNT; i++){ | |
| 8172 int j; | |
| 8173 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 8174 for(j=0; j<16; j++){ | |
| 8175 ref[j]= random()%255; | |
| 8176 src[j]= random()%255; | |
| 8177 } | |
| 8178 | |
| 8179 h264_diff_dct_c(block, src, ref, 4); | |
| 2967 | 8180 |
| 1168 | 8181 //normalize |
| 8182 for(j=0; j<16; j++){ | |
| 8183 // printf("%d ", block[j]); | |
| 8184 block[j]= block[j]*4; | |
| 8185 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 8186 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 8187 } | |
| 8188 // printf("\n"); | |
| 2967 | 8189 |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
8190 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 8191 /* for(j=0; j<16; j++){ |
| 8192 printf("%d ", ref[j]); | |
| 8193 } | |
| 8194 printf("\n");*/ | |
| 2967 | 8195 |
| 1168 | 8196 for(j=0; j<16; j++){ |
| 4001 | 8197 int diff= FFABS(src[j] - ref[j]); |
| 2967 | 8198 |
| 1168 | 8199 error+= diff*diff; |
| 8200 max_error= FFMAX(max_error, diff); | |
| 8201 } | |
| 8202 } | |
| 8203 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 8204 #if 0 | |
| 8205 printf("testing quantizer\n"); | |
| 8206 for(qp=0; qp<52; qp++){ | |
| 8207 for(i=0; i<16; i++) | |
| 8208 src1_block[i]= src2_block[i]= random()%255; | |
| 2967 | 8209 |
| 1168 | 8210 } |
| 8211 #endif | |
| 8212 printf("Testing NAL layer\n"); | |
| 2967 | 8213 |
| 1168 | 8214 uint8_t bitstream[COUNT]; |
| 8215 uint8_t nal[COUNT*2]; | |
| 8216 H264Context h; | |
| 8217 memset(&h, 0, sizeof(H264Context)); | |
| 2967 | 8218 |
| 1168 | 8219 for(i=0; i<COUNT; i++){ |
| 8220 int zeros= i; | |
| 8221 int nal_length; | |
| 8222 int consumed; | |
| 8223 int out_length; | |
| 8224 uint8_t *out; | |
| 8225 int j; | |
| 2967 | 8226 |
| 1168 | 8227 for(j=0; j<COUNT; j++){ |
| 8228 bitstream[j]= (random() % 255) + 1; | |
| 8229 } | |
| 2967 | 8230 |
| 1168 | 8231 for(j=0; j<zeros; j++){ |
| 8232 int pos= random() % COUNT; | |
| 8233 while(bitstream[pos] == 0){ | |
| 8234 pos++; | |
| 8235 pos %= COUNT; | |
| 8236 } | |
| 8237 bitstream[pos]=0; | |
| 8238 } | |
| 2967 | 8239 |
| 1168 | 8240 START_TIMER |
| 2967 | 8241 |
| 1168 | 8242 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); |
| 8243 if(nal_length<0){ | |
| 8244 printf("encoding failed\n"); | |
| 8245 return -1; | |
| 8246 } | |
| 2967 | 8247 |
| 1168 | 8248 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); |
| 8249 | |
| 8250 STOP_TIMER("NAL") | |
| 2967 | 8251 |
| 1168 | 8252 if(out_length != COUNT){ |
| 8253 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 8254 return -1; | |
| 8255 } | |
| 2967 | 8256 |
| 1168 | 8257 if(consumed != nal_length){ |
| 8258 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 8259 return -1; | |
| 8260 } | |
| 2967 | 8261 |
| 1168 | 8262 if(memcmp(bitstream, out, COUNT)){ |
| 5127 | 8263 printf("mismatch\n"); |
| 1168 | 8264 return -1; |
| 8265 } | |
| 8266 } | |
| 2967 | 8267 |
| 1168 | 8268 printf("Testing RBSP\n"); |
| 2967 | 8269 |
| 8270 | |
| 1168 | 8271 return 0; |
| 8272 } | |
| 8273 #endif | |
| 8274 | |
| 8275 | |
| 8276 static int decode_end(AVCodecContext *avctx) | |
| 8277 { | |
| 8278 H264Context *h = avctx->priv_data; | |
| 8279 MpegEncContext *s = &h->s; | |
| 2967 | 8280 |
| 5174 | 8281 av_freep(&h->rbsp_buffer[0]); |
| 8282 av_freep(&h->rbsp_buffer[1]); | |
| 1168 | 8283 free_tables(h); //FIXME cleanup init stuff perhaps |
| 8284 MPV_common_end(s); | |
| 8285 | |
| 8286 // memset(h, 0, sizeof(H264Context)); | |
| 2967 | 8287 |
| 1168 | 8288 return 0; |
| 8289 } | |
| 8290 | |
| 8291 | |
| 8292 AVCodec h264_decoder = { | |
| 8293 "h264", | |
| 8294 CODEC_TYPE_VIDEO, | |
| 8295 CODEC_ID_H264, | |
| 8296 sizeof(H264Context), | |
| 8297 decode_init, | |
| 8298 NULL, | |
| 8299 decode_end, | |
| 8300 decode_frame, | |
| 2453 | 8301 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 2640 | 8302 .flush= flush_dpb, |
| 1168 | 8303 }; |
| 8304 | |
| 1234 | 8305 #include "svq3.c" |
