Mercurial > libavcodec.hg
annotate h264.c @ 7482:ecf3c774f5e1 libavcodec
Fill ref_count/ref_poc for both fields of frames.
author | michael |
---|---|
date | Mon, 04 Aug 2008 22:32:41 +0000 |
parents | ca205cc57734 |
children | edea5d7db24d |
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" |
6020 | 35 #include "rectangle.h" |
1168 | 36 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
37 #include "cabac.h" |
6604
e226f34ca284
Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents:
6603
diff
changeset
|
38 #ifdef ARCH_X86 |
e226f34ca284
Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents:
6603
diff
changeset
|
39 #include "i386/h264_i386.h" |
e226f34ca284
Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
heydowns
parents:
6603
diff
changeset
|
40 #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
|
41 |
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3219
diff
changeset
|
42 //#undef NDEBUG |
1168 | 43 #include <assert.h> |
44 | |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
45 /** |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
46 * Value of Picture.reference when Picture is not a reference picture, but |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
47 * is held for delayed output. |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
48 */ |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
49 #define DELAYED_PIC_REF 4 |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
50 |
1168 | 51 static VLC coeff_token_vlc[4]; |
7481 | 52 static VLC_TYPE coeff_token_vlc_tables[520+332+280+256][2]; |
53 static const int coeff_token_vlc_tables_size[4]={520,332,280,256}; | |
54 | |
1168 | 55 static VLC chroma_dc_coeff_token_vlc; |
7481 | 56 static VLC_TYPE chroma_dc_coeff_token_vlc_table[256][2]; |
57 static const int chroma_dc_coeff_token_vlc_table_size = 256; | |
1168 | 58 |
59 static VLC total_zeros_vlc[15]; | |
7481 | 60 static VLC_TYPE total_zeros_vlc_tables[15][512][2]; |
61 static const int total_zeros_vlc_tables_size = 512; | |
62 | |
1168 | 63 static VLC chroma_dc_total_zeros_vlc[3]; |
7481 | 64 static VLC_TYPE chroma_dc_total_zeros_vlc_tables[3][8][2]; |
65 static const int chroma_dc_total_zeros_vlc_tables_size = 8; | |
1168 | 66 |
67 static VLC run_vlc[6]; | |
7481 | 68 static VLC_TYPE run_vlc_tables[6][8][2]; |
69 static const int run_vlc_tables_size = 8; | |
70 | |
1168 | 71 static VLC run7_vlc; |
7481 | 72 static VLC_TYPE run7_vlc_table[96][2]; |
73 static const int run7_vlc_table_size = 96; | |
1168 | 74 |
1234 | 75 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
76 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
|
77 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
|
78 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); |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
79 static Picture * remove_long(H264Context *h, int i, int ref_mask); |
1234 | 80 |
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4277
diff
changeset
|
81 static av_always_inline uint32_t pack16to32(int a, int b){ |
1269 | 82 #ifdef WORDS_BIGENDIAN |
83 return (b&0xFFFF) + (a<<16); | |
84 #else | |
85 return (a&0xFFFF) + (b<<16); | |
86 #endif | |
87 } | |
88 | |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
89 const uint8_t ff_rem6[52]={ |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
90 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
|
91 }; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
92 |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
93 const uint8_t ff_div6[52]={ |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
94 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
|
95 }; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
96 |
7423 | 97 static const int left_block_options[4][8]={ |
98 {0,1,2,3,7,10,8,11}, | |
99 {2,2,3,3,8,11,8,11}, | |
100 {0,0,1,1,7,10,7,10}, | |
101 {0,2,0,2,7,10,7,10} | |
102 }; | |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
103 |
3028 | 104 static void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
1168 | 105 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
106 const int mb_xy= h->mb_xy; |
1168 | 107 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
108 int topleft_type, top_type, topright_type, left_type[2]; | |
7423 | 109 int * left_block; |
6310 | 110 int topleft_partition= -1; |
1168 | 111 int i; |
112 | |
6014
33b0514769b2
Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents:
5987
diff
changeset
|
113 top_xy = mb_xy - (s->mb_stride << FIELD_PICTURE); |
33b0514769b2
Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents:
5987
diff
changeset
|
114 |
3482 | 115 //FIXME deblocking could skip the intra and nnz parts. |
6014
33b0514769b2
Fix non_zero_count_cache for deblocking in field pictures.
heydowns
parents:
5987
diff
changeset
|
116 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[top_xy]) && !FRAME_MBAFF) |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
117 return; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
118 |
6488 | 119 /* Wow, what a mess, why didn't they simplify the interlacing & intra |
120 * stuff, I can't imagine that these complex rules are worth it. */ | |
2967 | 121 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
122 topleft_xy = top_xy - 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
123 topright_xy= top_xy + 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
124 left_xy[1] = left_xy[0] = mb_xy-1; |
7423 | 125 left_block = left_block_options[0]; |
3316 | 126 if(FRAME_MBAFF){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
127 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
|
128 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
|
129 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
|
130 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
|
131 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
|
132 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
|
133 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
|
134 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
|
135 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
|
136 const int bottom = (s->mb_y & 1); |
4600 | 137 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
|
138 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
139 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
140 : (!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
|
141 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
142 top_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
143 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
144 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
145 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
146 : (!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
|
147 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
148 topleft_xy -= s->mb_stride; |
6310 | 149 } else if(bottom && curr_mb_frame_flag && !left_mb_frame_flag) { |
150 topleft_xy += s->mb_stride; | |
7374 | 151 // take top left mv from the middle of the mb, as opposed to all other modes which use the bottom right partition |
6310 | 152 topleft_partition = 0; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
153 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
154 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
155 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
156 : (!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
|
157 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
158 topright_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
159 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
160 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
|
161 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
|
162 if (curr_mb_frame_flag) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
163 if (bottom) { |
7423 | 164 left_block = left_block_options[1]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
165 } else { |
7423 | 166 left_block= left_block_options[2]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
167 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
168 } else { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
169 left_xy[1] += s->mb_stride; |
7423 | 170 left_block = left_block_options[3]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
171 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
172 } |
1168 | 173 } |
174 | |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
175 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
|
176 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
|
177 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
|
178 if(for_deblock){ |
3482 | 179 topleft_type = 0; |
180 topright_type = 0; | |
2449 | 181 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; |
182 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
183 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
3316 | 184 |
185 if(FRAME_MBAFF && !IS_INTRA(mb_type)){ | |
186 int list; | |
187 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14]; | |
188 for(i=0; i<16; i++) | |
189 h->non_zero_count_cache[scan8[i]] = (v>>i)&1; | |
4533 | 190 for(list=0; list<h->list_count; list++){ |
3316 | 191 if(USES_LIST(mb_type,list)){ |
192 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]]; | |
193 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]]; | |
3776 | 194 int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; |
3316 | 195 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){ |
196 dst[0] = src[0]; | |
197 dst[1] = src[1]; | |
198 dst[2] = src[2]; | |
199 dst[3] = src[3]; | |
200 } | |
201 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] = | |
202 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101; | |
203 ref += h->b8_stride; | |
204 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] = | |
205 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101; | |
206 }else{ | |
207 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4); | |
208 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); | |
209 } | |
210 } | |
211 } | |
2449 | 212 }else{ |
213 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
214 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
215 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
216 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
217 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
218 } | |
1168 | 219 |
220 if(IS_INTRA(mb_type)){ | |
2967 | 221 h->topleft_samples_available= |
222 h->top_samples_available= | |
1168 | 223 h->left_samples_available= 0xFFFF; |
224 h->topright_samples_available= 0xEEEA; | |
225 | |
226 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
227 h->topleft_samples_available= 0xB3FF; | |
228 h->top_samples_available= 0x33FF; | |
229 h->topright_samples_available= 0x26EA; | |
230 } | |
231 for(i=0; i<2; i++){ | |
232 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
233 h->topleft_samples_available&= 0xDF5F; | |
234 h->left_samples_available&= 0x5F5F; | |
235 } | |
236 } | |
2967 | 237 |
1168 | 238 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) |
239 h->topleft_samples_available&= 0x7FFF; | |
2967 | 240 |
1168 | 241 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) |
242 h->topright_samples_available&= 0xFBFF; | |
2967 | 243 |
1168 | 244 if(IS_INTRA4x4(mb_type)){ |
245 if(IS_INTRA4x4(top_type)){ | |
246 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
247 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
248 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
249 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
250 }else{ | |
251 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
252 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
|
253 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
254 else{ |
1168 | 255 pred= 2; |
256 } | |
257 h->intra4x4_pred_mode_cache[4+8*0]= | |
258 h->intra4x4_pred_mode_cache[5+8*0]= | |
259 h->intra4x4_pred_mode_cache[6+8*0]= | |
260 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
261 } | |
262 for(i=0; i<2; i++){ | |
263 if(IS_INTRA4x4(left_type[i])){ | |
264 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
265 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
266 }else{ | |
267 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
268 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
|
269 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
270 else{ |
1168 | 271 pred= 2; |
272 } | |
273 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
274 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
275 } | |
276 } | |
277 } | |
278 } | |
2967 | 279 |
280 | |
1168 | 281 /* |
2967 | 282 0 . T T. T T T T |
283 1 L . .L . . . . | |
284 2 L . .L . . . . | |
285 3 . T TL . . . . | |
286 4 L . .L . . . . | |
287 5 L . .. . . . . | |
1168 | 288 */ |
7374 | 289 //FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec) |
1168 | 290 if(top_type){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
291 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
|
292 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
|
293 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
|
294 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
2967 | 295 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
296 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
|
297 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
2967 | 298 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
299 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
|
300 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
2967 | 301 |
1168 | 302 }else{ |
2967 | 303 h->non_zero_count_cache[4+8*0]= |
1168 | 304 h->non_zero_count_cache[5+8*0]= |
305 h->non_zero_count_cache[6+8*0]= | |
306 h->non_zero_count_cache[7+8*0]= | |
2967 | 307 |
1168 | 308 h->non_zero_count_cache[1+8*0]= |
309 h->non_zero_count_cache[2+8*0]= | |
2967 | 310 |
1168 | 311 h->non_zero_count_cache[1+8*3]= |
2314 | 312 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
2967 | 313 |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
314 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
315 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
316 for (i=0; i<2; i++) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
317 if(left_type[i]){ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
318 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
|
319 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
|
320 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
|
321 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
|
322 }else{ |
2967 | 323 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
324 h->non_zero_count_cache[3+8*2 + 2*8*i]= | |
325 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
|
326 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
|
327 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
328 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
329 |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
330 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
|
331 // top_cbp |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
332 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
|
333 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
|
334 } 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
|
335 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
|
336 } else { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
337 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
|
338 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
339 // left_cbp |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
340 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
|
341 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
|
342 } 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
|
343 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
|
344 } else { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
345 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
|
346 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
347 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
|
348 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
|
349 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
350 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
|
351 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
|
352 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
353 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
354 |
1168 | 355 #if 1 |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
356 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
1168 | 357 int list; |
4533 | 358 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
|
359 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){ |
1168 | 360 /*if(!h->mv_cache_clean[list]){ |
361 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
362 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
363 h->mv_cache_clean[list]= 1; | |
364 }*/ | |
2396 | 365 continue; |
1168 | 366 } |
367 h->mv_cache_clean[list]= 0; | |
2967 | 368 |
3212 | 369 if(USES_LIST(top_type, list)){ |
1168 | 370 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
371 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
372 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
373 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
374 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
375 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
376 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
377 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
378 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
379 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
380 }else{ | |
2967 | 381 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= |
382 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
383 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
1168 | 384 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; |
385 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
386 } | |
387 | |
4546 | 388 for(i=0; i<2; i++){ |
389 int cache_idx = scan8[0] - 1 + i*2*8; | |
390 if(USES_LIST(left_type[i], list)){ | |
391 const int b_xy= h->mb2b_xy[left_xy[i]] + 3; | |
392 const int b8_xy= h->mb2b8_xy[left_xy[i]] + 1; | |
393 *(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]]; | |
394 *(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]]; | |
395 h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0+i*2]>>1)]; | |
396 h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1+i*2]>>1)]; | |
397 }else{ | |
398 *(uint32_t*)h->mv_cache [list][cache_idx ]= | |
399 *(uint32_t*)h->mv_cache [list][cache_idx+8]= 0; | |
400 h->ref_cache[list][cache_idx ]= | |
401 h->ref_cache[list][cache_idx+8]= left_type[i] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
402 } | |
1168 | 403 } |
404 | |
3519 | 405 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF) |
2449 | 406 continue; |
407 | |
3212 | 408 if(USES_LIST(topleft_type, list)){ |
6310 | 409 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + h->b_stride + (topleft_partition & 2*h->b_stride); |
410 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + (topleft_partition & h->b8_stride); | |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
411 *(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
|
412 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
|
413 }else{ |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
414 *(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
|
415 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
|
416 } |
2967 | 417 |
3212 | 418 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
|
419 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
|
420 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
|
421 *(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
|
422 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
|
423 }else{ |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
424 *(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
|
425 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
|
426 } |
2967 | 427 |
3519 | 428 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) |
3482 | 429 continue; |
2967 | 430 |
431 h->ref_cache[list][scan8[5 ]+1] = | |
432 h->ref_cache[list][scan8[7 ]+1] = | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
433 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |
2967 | 434 h->ref_cache[list][scan8[4 ]] = |
1168 | 435 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; |
436 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
437 *(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
|
438 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
1168 | 439 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= |
440 *(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
|
441 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
442 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
|
443 /* XXX beurk, Load mvd */ |
3212 | 444 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
|
445 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
|
446 *(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
|
447 *(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
|
448 *(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
|
449 *(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
|
450 }else{ |
2967 | 451 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]= |
452 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]= | |
453 *(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
|
454 *(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
|
455 } |
3212 | 456 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
|
457 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
|
458 *(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
|
459 *(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
|
460 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
461 *(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
|
462 *(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
|
463 } |
3212 | 464 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
|
465 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
|
466 *(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
|
467 *(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
|
468 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
469 *(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
|
470 *(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
|
471 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
472 *(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
|
473 *(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
|
474 *(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
|
475 *(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
|
476 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
2396 | 477 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
478 if(h->slice_type_nos == FF_B_TYPE){ |
2396 | 479 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); |
480 | |
481 if(IS_DIRECT(top_type)){ | |
482 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
483 }else if(IS_8X8(top_type)){ | |
484 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
485 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
486 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
487 }else{ | |
488 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
489 } | |
2967 | 490 |
3316 | 491 if(IS_DIRECT(left_type[0])) |
492 h->direct_cache[scan8[0] - 1 + 0*8]= 1; | |
493 else if(IS_8X8(left_type[0])) | |
494 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)]; | |
495 else | |
496 h->direct_cache[scan8[0] - 1 + 0*8]= 0; | |
497 | |
498 if(IS_DIRECT(left_type[1])) | |
2396 | 499 h->direct_cache[scan8[0] - 1 + 2*8]= 1; |
3316 | 500 else if(IS_8X8(left_type[1])) |
501 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)]; | |
502 else | |
2396 | 503 h->direct_cache[scan8[0] - 1 + 2*8]= 0; |
3316 | 504 } |
505 } | |
506 | |
507 if(FRAME_MBAFF){ | |
508 #define MAP_MVS\ | |
509 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\ | |
510 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\ | |
511 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\ | |
512 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\ | |
513 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\ | |
514 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\ | |
515 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\ | |
516 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\ | |
517 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\ | |
518 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1]) | |
519 if(MB_FIELD){ | |
520 #define MAP_F2F(idx, mb_type)\ | |
521 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
522 h->ref_cache[list][idx] <<= 1;\ | |
523 h->mv_cache[list][idx][1] /= 2;\ | |
524 h->mvd_cache[list][idx][1] /= 2;\ | |
2396 | 525 } |
3316 | 526 MAP_MVS |
527 #undef MAP_F2F | |
528 }else{ | |
529 #define MAP_F2F(idx, mb_type)\ | |
530 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
531 h->ref_cache[list][idx] >>= 1;\ | |
532 h->mv_cache[list][idx][1] <<= 1;\ | |
533 h->mvd_cache[list][idx][1] <<= 1;\ | |
534 } | |
535 MAP_MVS | |
536 #undef MAP_F2F | |
2396 | 537 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
538 } |
1168 | 539 } |
540 } | |
541 #endif | |
2755 | 542 |
543 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); | |
1168 | 544 } |
545 | |
546 static inline void write_back_intra_pred_mode(H264Context *h){ | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
547 const int mb_xy= h->mb_xy; |
1168 | 548 |
549 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
550 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
551 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
552 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
553 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
554 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
555 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
556 } | |
557 | |
558 /** | |
559 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
560 */ | |
561 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
562 MpegEncContext * const s = &h->s; | |
563 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
564 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
565 int i; | |
2967 | 566 |
1168 | 567 if(!(h->top_samples_available&0x8000)){ |
568 for(i=0; i<4; i++){ | |
569 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
570 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
571 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 | 572 return -1; |
573 } else if(status){ | |
574 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
575 } | |
576 } | |
577 } | |
2967 | 578 |
1168 | 579 if(!(h->left_samples_available&0x8000)){ |
580 for(i=0; i<4; i++){ | |
581 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
582 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
583 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 | 584 return -1; |
585 } else if(status){ | |
586 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
587 } | |
588 } | |
589 } | |
590 | |
591 return 0; | |
592 } //FIXME cleanup like next | |
593 | |
594 /** | |
595 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
596 */ | |
597 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
598 MpegEncContext * const s = &h->s; | |
599 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
600 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
2967 | 601 |
4529 | 602 if(mode > 6U) { |
2392 | 603 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 | 604 return -1; |
2392 | 605 } |
2967 | 606 |
1168 | 607 if(!(h->top_samples_available&0x8000)){ |
608 mode= top[ mode ]; | |
609 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
610 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 | 611 return -1; |
612 } | |
613 } | |
2967 | 614 |
1168 | 615 if(!(h->left_samples_available&0x8000)){ |
616 mode= left[ mode ]; | |
617 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
618 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 | 619 return -1; |
2967 | 620 } |
1168 | 621 } |
622 | |
623 return mode; | |
624 } | |
625 | |
626 /** | |
627 * gets the predicted intra4x4 prediction mode. | |
628 */ | |
629 static inline int pred_intra_mode(H264Context *h, int n){ | |
630 const int index8= scan8[n]; | |
631 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
632 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
633 const int min= FFMIN(left, top); | |
634 | |
4600 | 635 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min); |
1168 | 636 |
637 if(min<0) return DC_PRED; | |
638 else return min; | |
639 } | |
640 | |
641 static inline void write_back_non_zero_count(H264Context *h){ | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
642 const int mb_xy= h->mb_xy; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
643 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
644 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
|
645 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
|
646 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
|
647 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
|
648 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
|
649 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
|
650 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4]; |
2967 | 651 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
652 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
|
653 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
|
654 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
|
655 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
656 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
|
657 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
|
658 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
3316 | 659 |
660 if(FRAME_MBAFF){ | |
661 // store all luma nnzs, for deblocking | |
662 int v = 0, i; | |
663 for(i=0; i<16; i++) | |
664 v += (!!h->non_zero_count_cache[scan8[i]]) << i; | |
665 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v; | |
666 } | |
1168 | 667 } |
668 | |
669 /** | |
7374 | 670 * gets the predicted number of non-zero coefficients. |
1168 | 671 * @param n block index |
672 */ | |
673 static inline int pred_non_zero_count(H264Context *h, int n){ | |
674 const int index8= scan8[n]; | |
675 const int left= h->non_zero_count_cache[index8 - 1]; | |
676 const int top = h->non_zero_count_cache[index8 - 8]; | |
677 int i= left + top; | |
2967 | 678 |
1168 | 679 if(i<64) i= (i+1)>>1; |
680 | |
4600 | 681 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 | 682 |
683 return i&31; | |
684 } | |
685 | |
1169 | 686 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
687 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
4600 | 688 MpegEncContext *s = &h->s; |
1169 | 689 |
3316 | 690 /* there is no consistent mapping of mvs to neighboring locations that will |
691 * make mbaff happy, so we can't move all this logic to fill_caches */ | |
692 if(FRAME_MBAFF){ | |
3776 | 693 const uint32_t *mb_types = s->current_picture_ptr->mb_type; |
3316 | 694 const int16_t *mv; |
695 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0; | |
696 *C = h->mv_cache[list][scan8[0]-2]; | |
697 | |
698 if(!MB_FIELD | |
699 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){ | |
700 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3); | |
701 if(IS_INTERLACED(mb_types[topright_xy])){ | |
702 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\ | |
703 const int x4 = X4, y4 = Y4;\ | |
704 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\ | |
6310 | 705 if(!USES_LIST(mb_type,list))\ |
3316 | 706 return LIST_NOT_USED;\ |
707 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\ | |
708 h->mv_cache[list][scan8[0]-2][0] = mv[0];\ | |
709 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\ | |
710 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP; | |
711 | |
712 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1); | |
713 } | |
714 } | |
715 if(topright_ref == PART_NOT_AVAILABLE | |
716 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4 | |
717 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){ | |
718 if(!MB_FIELD | |
719 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ | |
720 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1); | |
721 } | |
722 if(MB_FIELD | |
723 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]]) | |
724 && i >= scan8[0]+8){ | |
7374 | 725 // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK. |
6310 | 726 SET_DIAG_MV(/2, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2); |
3316 | 727 } |
728 } | |
729 #undef SET_DIAG_MV | |
730 } | |
731 | |
1169 | 732 if(topright_ref != PART_NOT_AVAILABLE){ |
733 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
734 return topright_ref; | |
735 }else{ | |
4600 | 736 tprintf(s->avctx, "topright MV not available\n"); |
1170 | 737 |
1169 | 738 *C= h->mv_cache[list][ i - 8 - 1 ]; |
739 return h->ref_cache[list][ i - 8 - 1 ]; | |
740 } | |
741 } | |
742 | |
1168 | 743 /** |
744 * gets the predicted MV. | |
745 * @param n the block index | |
746 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
747 * @param mx the x component of the predicted motion vector | |
748 * @param my the y component of the predicted motion vector | |
749 */ | |
750 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
751 const int index8= scan8[n]; | |
752 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
753 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
754 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
755 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
1169 | 756 const int16_t * C; |
757 int diagonal_ref, match_count; | |
758 | |
1168 | 759 assert(part_width==1 || part_width==2 || part_width==4); |
1169 | 760 |
1168 | 761 /* mv_cache |
2967 | 762 B . . A T T T T |
1168 | 763 U . . L . . , . |
764 U . . L . . . . | |
765 U . . L . . , . | |
766 . . . L . . . . | |
767 */ | |
1169 | 768 |
769 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
770 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
4600 | 771 tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count); |
1169 | 772 if(match_count > 1){ //most common |
773 *mx= mid_pred(A[0], B[0], C[0]); | |
774 *my= mid_pred(A[1], B[1], C[1]); | |
775 }else if(match_count==1){ | |
776 if(left_ref==ref){ | |
777 *mx= A[0]; | |
2967 | 778 *my= A[1]; |
1169 | 779 }else if(top_ref==ref){ |
780 *mx= B[0]; | |
2967 | 781 *my= B[1]; |
1169 | 782 }else{ |
783 *mx= C[0]; | |
2967 | 784 *my= C[1]; |
1169 | 785 } |
786 }else{ | |
787 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
788 *mx= A[0]; | |
2967 | 789 *my= A[1]; |
1168 | 790 }else{ |
791 *mx= mid_pred(A[0], B[0], C[0]); | |
792 *my= mid_pred(A[1], B[1], C[1]); | |
793 } | |
1169 | 794 } |
2967 | 795 |
4600 | 796 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 | 797 } |
798 | |
799 /** | |
800 * gets the directionally predicted 16x8 MV. | |
801 * @param n the block index | |
802 * @param mx the x component of the predicted motion vector | |
803 * @param my the y component of the predicted motion vector | |
804 */ | |
805 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
806 if(n==0){ | |
807 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
808 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
809 | |
4600 | 810 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 | 811 |
1168 | 812 if(top_ref == ref){ |
813 *mx= B[0]; | |
814 *my= B[1]; | |
815 return; | |
816 } | |
817 }else{ | |
818 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
819 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
2967 | 820 |
4600 | 821 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 | 822 |
823 if(left_ref == ref){ | |
824 *mx= A[0]; | |
825 *my= A[1]; | |
826 return; | |
827 } | |
828 } | |
829 | |
830 //RARE | |
831 pred_motion(h, n, 4, list, ref, mx, my); | |
832 } | |
833 | |
834 /** | |
835 * gets the directionally predicted 8x16 MV. | |
836 * @param n the block index | |
837 * @param mx the x component of the predicted motion vector | |
838 * @param my the y component of the predicted motion vector | |
839 */ | |
840 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
841 if(n==0){ | |
842 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
843 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
2967 | 844 |
4600 | 845 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 | 846 |
847 if(left_ref == ref){ | |
848 *mx= A[0]; | |
849 *my= A[1]; | |
850 return; | |
851 } | |
852 }else{ | |
1169 | 853 const int16_t * C; |
854 int diagonal_ref; | |
855 | |
856 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
2967 | 857 |
4600 | 858 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 | 859 |
2967 | 860 if(diagonal_ref == ref){ |
1168 | 861 *mx= C[0]; |
862 *my= C[1]; | |
863 return; | |
864 } | |
865 } | |
866 | |
867 //RARE | |
868 pred_motion(h, n, 2, list, ref, mx, my); | |
869 } | |
870 | |
871 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
872 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
873 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
874 | |
4600 | 875 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 | 876 |
877 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
878 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
879 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
2967 | 880 |
1168 | 881 *mx = *my = 0; |
882 return; | |
883 } | |
2967 | 884 |
1168 | 885 pred_motion(h, 0, 4, 0, 0, mx, my); |
886 | |
887 return; | |
888 } | |
889 | |
2396 | 890 static inline void direct_dist_scale_factor(H264Context * const h){ |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
891 MpegEncContext * const s = &h->s; |
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
892 const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ]; |
2396 | 893 const int poc1 = h->ref_list[1][0].poc; |
894 int i; | |
895 for(i=0; i<h->ref_count[0]; i++){ | |
896 int poc0 = h->ref_list[0][i].poc; | |
4594 | 897 int td = av_clip(poc1 - poc0, -128, 127); |
7479
6abd94f87b45
Fix dist_scale_factor for long term reference pictures.
michael
parents:
7474
diff
changeset
|
898 if(td == 0 || h->ref_list[0][i].long_ref){ |
2396 | 899 h->dist_scale_factor[i] = 256; |
900 }else{ | |
4594 | 901 int tb = av_clip(poc - poc0, -128, 127); |
4001 | 902 int tx = (16384 + (FFABS(td) >> 1)) / td; |
4594 | 903 h->dist_scale_factor[i] = av_clip((tb*tx + 32) >> 6, -1024, 1023); |
2396 | 904 } |
905 } | |
3316 | 906 if(FRAME_MBAFF){ |
907 for(i=0; i<h->ref_count[0]; i++){ | |
908 h->dist_scale_factor_field[2*i] = | |
909 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i]; | |
910 } | |
911 } | |
2396 | 912 } |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
913 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
|
914 MpegEncContext * const s = &h->s; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
915 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
|
916 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
|
917 int list, i, j; |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
918 int sidx= s->picture_structure&1; |
7480 | 919 int ref1sidx= ref1->reference&1; |
6481 | 920 if(cur->pict_type == FF_I_TYPE) |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
921 cur->ref_count[sidx][0] = 0; |
6481 | 922 if(cur->pict_type != FF_B_TYPE) |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
923 cur->ref_count[sidx][1] = 0; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
924 for(list=0; list<2; list++){ |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
925 cur->ref_count[sidx][list] = h->ref_count[list]; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
926 for(j=0; j<h->ref_count[list]; j++) |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
927 cur->ref_poc[sidx][list][j] = h->ref_list[list][j].poc; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
928 } |
7482 | 929 if(s->picture_structure == PICT_FRAME){ |
930 memcpy(cur->ref_count[0], cur->ref_count[1], sizeof(cur->ref_count[0])); | |
931 memcpy(cur->ref_poc [0], cur->ref_poc [1], sizeof(cur->ref_poc [0])); | |
932 } | |
6481 | 933 if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred) |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
934 return; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
935 for(list=0; list<2; list++){ |
7480 | 936 for(i=0; i<ref1->ref_count[ref1sidx][list]; i++){ |
937 const int poc = ref1->ref_poc[ref1sidx][list][i]; | |
3125 | 938 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
|
939 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
|
940 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
|
941 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
|
942 break; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
943 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
944 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
945 } |
3316 | 946 if(FRAME_MBAFF){ |
947 for(list=0; list<2; list++){ | |
7480 | 948 for(i=0; i<ref1->ref_count[ref1sidx][list]; i++){ |
3316 | 949 j = h->map_col_to_list0[list][i]; |
950 h->map_col_to_list0_field[list][2*i] = 2*j; | |
951 h->map_col_to_list0_field[list][2*i+1] = 2*j+1; | |
952 } | |
953 } | |
954 } | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
955 } |
2396 | 956 |
957 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
958 MpegEncContext * const s = &h->s; | |
7474
9ed1ef44127b
Use the correct collocated field in pred_direct_motion() when it differs in parity.
michael
parents:
7469
diff
changeset
|
959 const int fieldoff= (s->picture_structure & h->ref_list[1][0].reference) ? 0 : (3-2*s->picture_structure); |
9ed1ef44127b
Use the correct collocated field in pred_direct_motion() when it differs in parity.
michael
parents:
7469
diff
changeset
|
960 const int mb_xy = h->mb_xy + s->mb_stride*fieldoff; |
9ed1ef44127b
Use the correct collocated field in pred_direct_motion() when it differs in parity.
michael
parents:
7469
diff
changeset
|
961 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride + 2*h->b8_stride*fieldoff; |
9ed1ef44127b
Use the correct collocated field in pred_direct_motion() when it differs in parity.
michael
parents:
7469
diff
changeset
|
962 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h-> b_stride + 4*h-> b_stride*fieldoff; |
2396 | 963 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; |
964 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
|
965 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy]; |
2396 | 966 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
|
967 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
2396 | 968 const int is_b8x8 = IS_8X8(*mb_type); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
969 unsigned int sub_mb_type; |
2396 | 970 int i8, i4; |
971 | |
3316 | 972 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) |
2396 | 973 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ |
974 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
975 * so we know exactly what block size to use */ | |
976 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
2536 | 977 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
3316 | 978 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){ |
2396 | 979 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ |
980 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
981 }else{ | |
982 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
2536 | 983 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
2396 | 984 } |
985 if(!is_b8x8) | |
986 *mb_type |= MB_TYPE_DIRECT2; | |
3316 | 987 if(MB_FIELD) |
988 *mb_type |= MB_TYPE_INTERLACED; | |
2396 | 989 |
4600 | 990 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 | 991 |
2396 | 992 if(h->direct_spatial_mv_pred){ |
993 int ref[2]; | |
994 int mv[2][2]; | |
995 int list; | |
996 | |
3316 | 997 /* FIXME interlacing + spatial direct uses wrong colocated block positions */ |
998 | |
2396 | 999 /* ref = min(neighbors) */ |
1000 for(list=0; list<2; list++){ | |
1001 int refa = h->ref_cache[list][scan8[0] - 1]; | |
1002 int refb = h->ref_cache[list][scan8[0] - 8]; | |
1003 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
7445
a202753ce99d
Use #define instead of a constant. Patch by Paul Kendall.
darkshikari
parents:
7444
diff
changeset
|
1004 if(refc == PART_NOT_AVAILABLE) |
2396 | 1005 refc = h->ref_cache[list][scan8[0] - 8 - 1]; |
7336
aaf3e396f094
Simplify spatial direct ref selection with FFMIN3()
michael
parents:
7332
diff
changeset
|
1006 ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc); |
2396 | 1007 if(ref[list] < 0) |
1008 ref[list] = -1; | |
1009 } | |
1010 | |
1011 if(ref[0] < 0 && ref[1] < 0){ | |
1012 ref[0] = ref[1] = 0; | |
1013 mv[0][0] = mv[0][1] = | |
1014 mv[1][0] = mv[1][1] = 0; | |
1015 }else{ | |
1016 for(list=0; list<2; list++){ | |
1017 if(ref[list] >= 0) | |
1018 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
1019 else | |
1020 mv[list][0] = mv[list][1] = 0; | |
1021 } | |
1022 } | |
1023 | |
1024 if(ref[1] < 0){ | |
6309 | 1025 if(!is_b8x8) |
1026 *mb_type &= ~MB_TYPE_L1; | |
1027 sub_mb_type &= ~MB_TYPE_L1; | |
2396 | 1028 }else if(ref[0] < 0){ |
6309 | 1029 if(!is_b8x8) |
1030 *mb_type &= ~MB_TYPE_L0; | |
1031 sub_mb_type &= ~MB_TYPE_L0; | |
1032 } | |
1033 | |
1034 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){ | |
1035 int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride; | |
1036 int mb_types_col[2]; | |
1037 int b8_stride = h->b8_stride; | |
1038 int b4_stride = h->b_stride; | |
1039 | |
1040 *mb_type = (*mb_type & ~MB_TYPE_16x16) | MB_TYPE_8x8; | |
1041 | |
1042 if(IS_INTERLACED(*mb_type)){ | |
1043 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy]; | |
1044 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
1045 if(s->mb_y&1){ | |
1046 l1ref0 -= 2*b8_stride; | |
1047 l1ref1 -= 2*b8_stride; | |
1048 l1mv0 -= 4*b4_stride; | |
1049 l1mv1 -= 4*b4_stride; | |
1050 } | |
1051 b8_stride *= 3; | |
1052 b4_stride *= 6; | |
1053 }else{ | |
1054 int cur_poc = s->current_picture_ptr->poc; | |
1055 int *col_poc = h->ref_list[1]->field_poc; | |
1056 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc); | |
1057 int dy = 2*col_parity - (s->mb_y&1); | |
1058 mb_types_col[0] = | |
1059 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy + col_parity*s->mb_stride]; | |
1060 l1ref0 += dy*b8_stride; | |
1061 l1ref1 += dy*b8_stride; | |
1062 l1mv0 += 2*dy*b4_stride; | |
1063 l1mv1 += 2*dy*b4_stride; | |
1064 b8_stride = 0; | |
1065 } | |
1066 | |
1067 for(i8=0; i8<4; i8++){ | |
1068 int x8 = i8&1; | |
1069 int y8 = i8>>1; | |
1070 int xy8 = x8+y8*b8_stride; | |
1071 int xy4 = 3*x8+y8*b4_stride; | |
1072 int a=0, b=0; | |
1073 | |
1074 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
1075 continue; | |
1076 h->sub_mb_type[i8] = sub_mb_type; | |
1077 | |
1078 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); | |
1079 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); | |
1080 if(!IS_INTRA(mb_types_col[y8]) | |
1081 && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1) | |
1082 || (l1ref0[xy8] < 0 && l1ref1[xy8] == 0 && FFABS(l1mv1[xy4][0]) <= 1 && FFABS(l1mv1[xy4][1]) <= 1))){ | |
1083 if(ref[0] > 0) | |
1084 a= pack16to32(mv[0][0],mv[0][1]); | |
1085 if(ref[1] > 0) | |
1086 b= pack16to32(mv[1][0],mv[1][1]); | |
1087 }else{ | |
1088 a= pack16to32(mv[0][0],mv[0][1]); | |
1089 b= pack16to32(mv[1][0],mv[1][1]); | |
1090 } | |
1091 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4); | |
1092 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4); | |
1093 } | |
1094 }else if(IS_16X16(*mb_type)){ | |
4540 | 1095 int a=0, b=0; |
1096 | |
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1097 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
|
1098 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1); |
2967 | 1099 if(!IS_INTRA(mb_type_col) |
4001 | 1100 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1) |
1101 || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 | |
2834 | 1102 && (h->x264_build>33 || !h->x264_build)))){ |
2396 | 1103 if(ref[0] > 0) |
4540 | 1104 a= pack16to32(mv[0][0],mv[0][1]); |
2396 | 1105 if(ref[1] > 0) |
4540 | 1106 b= pack16to32(mv[1][0],mv[1][1]); |
2396 | 1107 }else{ |
4540 | 1108 a= pack16to32(mv[0][0],mv[0][1]); |
1109 b= pack16to32(mv[1][0],mv[1][1]); | |
1110 } | |
1111 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, a, 4); | |
1112 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, b, 4); | |
2396 | 1113 }else{ |
1114 for(i8=0; i8<4; i8++){ | |
1115 const int x8 = i8&1; | |
1116 const int y8 = i8>>1; | |
2967 | 1117 |
2396 | 1118 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
1119 continue; | |
1120 h->sub_mb_type[i8] = sub_mb_type; | |
2967 | 1121 |
2396 | 1122 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); |
1123 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
|
1124 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
|
1125 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); |
2967 | 1126 |
2396 | 1127 /* col_zero_flag */ |
2967 | 1128 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0 |
1129 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0 | |
2834 | 1130 && (h->x264_build>33 || !h->x264_build)))){ |
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1131 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1; |
3002 | 1132 if(IS_SUB_8X8(sub_mb_type)){ |
1133 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
4001 | 1134 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
3002 | 1135 if(ref[0] == 0) |
1136 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1137 if(ref[1] == 0) | |
1138 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1139 } | |
1140 }else | |
2396 | 1141 for(i4=0; i4<4; i4++){ |
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1142 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
4001 | 1143 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){ |
2396 | 1144 if(ref[0] == 0) |
1145 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
1146 if(ref[1] == 0) | |
1147 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
1148 } | |
1149 } | |
1150 } | |
1151 } | |
1152 } | |
1153 }else{ /* direct temporal mv pred */ | |
3316 | 1154 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; |
1155 const int *dist_scale_factor = h->dist_scale_factor; | |
1156 | |
1157 if(FRAME_MBAFF){ | |
1158 if(IS_INTERLACED(*mb_type)){ | |
1159 map_col_to_list0[0] = h->map_col_to_list0_field[0]; | |
1160 map_col_to_list0[1] = h->map_col_to_list0_field[1]; | |
1161 dist_scale_factor = h->dist_scale_factor_field; | |
1162 } | |
1163 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){ | |
1164 /* FIXME assumes direct_8x8_inference == 1 */ | |
1165 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride; | |
1166 int mb_types_col[2]; | |
1167 int y_shift; | |
1168 | |
1169 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1 | |
1170 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2) | |
1171 | (*mb_type & MB_TYPE_INTERLACED); | |
1172 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16; | |
1173 | |
1174 if(IS_INTERLACED(*mb_type)){ | |
1175 /* frame to field scaling */ | |
1176 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy]; | |
1177 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
1178 if(s->mb_y&1){ | |
1179 l1ref0 -= 2*h->b8_stride; | |
1180 l1ref1 -= 2*h->b8_stride; | |
1181 l1mv0 -= 4*h->b_stride; | |
1182 l1mv1 -= 4*h->b_stride; | |
1183 } | |
1184 y_shift = 0; | |
1185 | |
1186 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA) | |
1187 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA) | |
1188 && !is_b8x8) | |
1189 *mb_type |= MB_TYPE_16x8; | |
1190 else | |
1191 *mb_type |= MB_TYPE_8x8; | |
1192 }else{ | |
1193 /* field to frame scaling */ | |
1194 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1) | |
1195 * but in MBAFF, top and bottom POC are equal */ | |
1196 int dy = (s->mb_y&1) ? 1 : 2; | |
1197 mb_types_col[0] = | |
1198 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
1199 l1ref0 += dy*h->b8_stride; | |
1200 l1ref1 += dy*h->b8_stride; | |
1201 l1mv0 += 2*dy*h->b_stride; | |
1202 l1mv1 += 2*dy*h->b_stride; | |
1203 y_shift = 2; | |
1204 | |
1205 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8)) | |
1206 && !is_b8x8) | |
1207 *mb_type |= MB_TYPE_16x16; | |
1208 else | |
1209 *mb_type |= MB_TYPE_8x8; | |
1210 } | |
1211 | |
1212 for(i8=0; i8<4; i8++){ | |
1213 const int x8 = i8&1; | |
1214 const int y8 = i8>>1; | |
1215 int ref0, scale; | |
1216 const int16_t (*l1mv)[2]= l1mv0; | |
1217 | |
1218 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
1219 continue; | |
1220 h->sub_mb_type[i8] = sub_mb_type; | |
1221 | |
1222 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1223 if(IS_INTRA(mb_types_col[y8])){ | |
1224 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1225 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1226 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1227 continue; | |
1228 } | |
1229 | |
1230 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride]; | |
1231 if(ref0 >= 0) | |
1232 ref0 = map_col_to_list0[0][ref0*2>>y_shift]; | |
1233 else{ | |
1234 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift]; | |
1235 l1mv= l1mv1; | |
1236 } | |
1237 scale = dist_scale_factor[ref0]; | |
1238 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
1239 | |
1240 { | |
1241 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride]; | |
1242 int my_col = (mv_col[1]<<y_shift)/2; | |
1243 int mx = (scale * mv_col[0] + 128) >> 8; | |
1244 int my = (scale * my_col + 128) >> 8; | |
1245 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); | |
1246 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4); | |
1247 } | |
1248 } | |
1249 return; | |
1250 } | |
1251 } | |
1252 | |
1253 /* one-to-one mv scaling */ | |
1254 | |
2396 | 1255 if(IS_16X16(*mb_type)){ |
4541 | 1256 int ref, mv0, mv1; |
1257 | |
2396 | 1258 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); |
1259 if(IS_INTRA(mb_type_col)){ | |
4541 | 1260 ref=mv0=mv1=0; |
2396 | 1261 }else{ |
3316 | 1262 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]] |
1263 : map_col_to_list0[1][l1ref1[0]]; | |
1264 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
|
1265 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; |
2396 | 1266 int mv_l0[2]; |
3316 | 1267 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
1268 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
4541 | 1269 ref= ref0; |
1270 mv0= pack16to32(mv_l0[0],mv_l0[1]); | |
1271 mv1= pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
1272 } | |
1273 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1); | |
1274 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, mv0, 4); | |
1275 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, mv1, 4); | |
2396 | 1276 }else{ |
1277 for(i8=0; i8<4; i8++){ | |
1278 const int x8 = i8&1; | |
1279 const int y8 = i8>>1; | |
3316 | 1280 int ref0, scale; |
2834 | 1281 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
|
1282 |
2396 | 1283 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
1284 continue; | |
1285 h->sub_mb_type[i8] = sub_mb_type; | |
3316 | 1286 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); |
2396 | 1287 if(IS_INTRA(mb_type_col)){ |
1288 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1289 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1290 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1291 continue; | |
1292 } | |
2967 | 1293 |
2396 | 1294 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
|
1295 if(ref0 >= 0) |
3316 | 1296 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
|
1297 else{ |
3316 | 1298 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
|
1299 l1mv= l1mv1; |
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1300 } |
3316 | 1301 scale = dist_scale_factor[ref0]; |
2967 | 1302 |
2396 | 1303 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); |
3002 | 1304 if(IS_SUB_8X8(sub_mb_type)){ |
1305 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
3316 | 1306 int mx = (scale * mv_col[0] + 128) >> 8; |
1307 int my = (scale * mv_col[1] + 128) >> 8; | |
3002 | 1308 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); |
1309 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4); | |
1310 }else | |
2396 | 1311 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
|
1312 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
2396 | 1313 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; |
3316 | 1314 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
1315 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
2396 | 1316 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = |
1317 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
1318 } | |
1319 } | |
1320 } | |
1321 } | |
1322 } | |
1323 | |
1168 | 1324 static inline void write_back_motion(H264Context *h, int mb_type){ |
1325 MpegEncContext * const s = &h->s; | |
1326 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1327 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1328 int list; | |
1329 | |
3219
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1330 if(!USES_LIST(mb_type, 0)) |
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1331 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
|
1332 |
4533 | 1333 for(list=0; list<h->list_count; list++){ |
1168 | 1334 int y; |
3212 | 1335 if(!USES_LIST(mb_type, list)) |
2396 | 1336 continue; |
2967 | 1337 |
1168 | 1338 for(y=0; y<4; y++){ |
1339 *(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]; | |
1340 *(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]; | |
1341 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1342 if( h->pps.cabac ) { |
3927 | 1343 if(IS_SKIP(mb_type)) |
1344 fill_rectangle(h->mvd_table[list][b_xy], 4, 4, h->b_stride, 0, 4); | |
1345 else | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1346 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
|
1347 *(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
|
1348 *(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
|
1349 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1350 } |
3212 | 1351 |
1352 { | |
3776 | 1353 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; |
3212 | 1354 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]]; |
1355 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]]; | |
1356 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]]; | |
1357 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]]; | |
1168 | 1358 } |
1359 } | |
2967 | 1360 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
1361 if(h->slice_type_nos == FF_B_TYPE && h->pps.cabac){ |
2396 | 1362 if(IS_8X8(mb_type)){ |
3212 | 1363 uint8_t *direct_table = &h->direct_table[b8_xy]; |
1364 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
1365 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
1366 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
2396 | 1367 } |
1368 } | |
1168 | 1369 } |
1370 | |
1371 /** | |
1372 * Decodes a network abstraction layer unit. | |
1373 * @param consumed is the number of bytes used as input | |
1374 * @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
|
1375 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
2967 | 1376 * @returns decoded bytes, might be src+1 if no escapes |
1168 | 1377 */ |
6216 | 1378 static const uint8_t *decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length){ |
1168 | 1379 int i, si, di; |
1380 uint8_t *dst; | |
5174 | 1381 int bufidx; |
1168 | 1382 |
2979 | 1383 // src[0]&0x80; //forbidden bit |
1168 | 1384 h->nal_ref_idc= src[0]>>5; |
1385 h->nal_unit_type= src[0]&0x1F; | |
1386 | |
1387 src++; length--; | |
2967 | 1388 #if 0 |
1168 | 1389 for(i=0; i<length; i++) |
1390 printf("%2X ", src[i]); | |
1391 #endif | |
1392 for(i=0; i+1<length; i+=2){ | |
1393 if(src[i]) continue; | |
1394 if(i>0 && src[i-1]==0) i--; | |
1395 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1396 if(src[i+2]!=3){ | |
1397 /* startcode, so we must be past the end */ | |
1398 length=i; | |
1399 } | |
1400 break; | |
1401 } | |
1402 } | |
1403 | |
1404 if(i>=length-1){ //no escaped 0 | |
1405 *dst_length= length; | |
1406 *consumed= length+1; //+1 for the header | |
2967 | 1407 return src; |
1168 | 1408 } |
1409 | |
5174 | 1410 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data |
1411 h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length); | |
1412 dst= h->rbsp_buffer[bufidx]; | |
1168 | 1413 |
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1414 if (dst == NULL){ |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1415 return NULL; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1416 } |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
1417 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1418 //printf("decoding esc\n"); |
1168 | 1419 si=di=0; |
2967 | 1420 while(si<length){ |
1168 | 1421 //remove escapes (very rare 1:2^22) |
1422 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1423 if(src[si+2]==3){ //escape | |
1424 dst[di++]= 0; | |
1425 dst[di++]= 0; | |
1426 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1427 continue; |
1168 | 1428 }else //next start code |
1429 break; | |
1430 } | |
1431 | |
1432 dst[di++]= src[si++]; | |
1433 } | |
1434 | |
1435 *dst_length= di; | |
1436 *consumed= si + 1;//+1 for the header | |
5129 | 1437 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding) |
1168 | 1438 return dst; |
1439 } | |
1440 | |
1441 /** | |
1442 * identifies the exact end of the bitstream | |
1443 * @return the length of the trailing, or 0 if damaged | |
1444 */ | |
6216 | 1445 static int decode_rbsp_trailing(H264Context *h, const uint8_t *src){ |
1168 | 1446 int v= *src; |
1447 int r; | |
1448 | |
4600 | 1449 tprintf(h->s.avctx, "rbsp trailing %X\n", v); |
1168 | 1450 |
1451 for(r=1; r<9; r++){ | |
1452 if(v&1) return r; | |
1453 v>>=1; | |
1454 } | |
1455 return 0; | |
1456 } | |
1457 | |
1458 /** | |
7374 | 1459 * IDCT transforms the 16 dc values and dequantizes them. |
1168 | 1460 * @param qp quantization parameter |
1461 */ | |
2919 | 1462 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 1463 #define stride 16 |
1464 int i; | |
1465 int temp[16]; //FIXME check if this is a good idea | |
1466 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1467 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1468 | |
1469 //memset(block, 64, 2*256); | |
1470 //return; | |
1471 for(i=0; i<4; i++){ | |
1472 const int offset= y_offset[i]; | |
1473 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1474 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1475 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1476 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1477 | |
1478 temp[4*i+0]= z0+z3; | |
1479 temp[4*i+1]= z1+z2; | |
1480 temp[4*i+2]= z1-z2; | |
1481 temp[4*i+3]= z0-z3; | |
1482 } | |
1483 | |
1484 for(i=0; i<4; i++){ | |
1485 const int offset= x_offset[i]; | |
1486 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1487 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1488 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1489 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1490 | |
7374 | 1491 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_residual |
2919 | 1492 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8)); |
1493 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8)); | |
1494 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8)); | |
1168 | 1495 } |
1496 } | |
1497 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1498 #if 0 |
1168 | 1499 /** |
7374 | 1500 * DCT transforms the 16 dc values. |
1168 | 1501 * @param qp quantization parameter ??? FIXME |
1502 */ | |
1503 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
1504 // const int qmul= dequant_coeff[qp][0]; | |
1505 int i; | |
1506 int temp[16]; //FIXME check if this is a good idea | |
1507 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1508 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1509 | |
1510 for(i=0; i<4; i++){ | |
1511 const int offset= y_offset[i]; | |
1512 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1513 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1514 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1515 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1516 | |
1517 temp[4*i+0]= z0+z3; | |
1518 temp[4*i+1]= z1+z2; | |
1519 temp[4*i+2]= z1-z2; | |
1520 temp[4*i+3]= z0-z3; | |
1521 } | |
1522 | |
1523 for(i=0; i<4; i++){ | |
1524 const int offset= x_offset[i]; | |
1525 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1526 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1527 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1528 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1529 | |
1530 block[stride*0 +offset]= (z0 + z3)>>1; | |
1531 block[stride*2 +offset]= (z1 + z2)>>1; | |
1532 block[stride*8 +offset]= (z1 - z2)>>1; | |
1533 block[stride*10+offset]= (z0 - z3)>>1; | |
1534 } | |
1535 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1536 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1537 |
1168 | 1538 #undef xStride |
1539 #undef stride | |
1540 | |
2919 | 1541 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 1542 const int stride= 16*2; |
1543 const int xStride= 16; | |
1544 int a,b,c,d,e; | |
1545 | |
1546 a= block[stride*0 + xStride*0]; | |
1547 b= block[stride*0 + xStride*1]; | |
1548 c= block[stride*1 + xStride*0]; | |
1549 d= block[stride*1 + xStride*1]; | |
1550 | |
1551 e= a-b; | |
1552 a= a+b; | |
1553 b= c-d; | |
1554 c= c+d; | |
1555 | |
2919 | 1556 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7; |
1557 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7; | |
1558 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7; | |
1559 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7; | |
1168 | 1560 } |
1561 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1562 #if 0 |
1168 | 1563 static void chroma_dc_dct_c(DCTELEM *block){ |
1564 const int stride= 16*2; | |
1565 const int xStride= 16; | |
1566 int a,b,c,d,e; | |
1567 | |
1568 a= block[stride*0 + xStride*0]; | |
1569 b= block[stride*0 + xStride*1]; | |
1570 c= block[stride*1 + xStride*0]; | |
1571 d= block[stride*1 + xStride*1]; | |
1572 | |
1573 e= a-b; | |
1574 a= a+b; | |
1575 b= c-d; | |
1576 c= c+d; | |
1577 | |
1578 block[stride*0 + xStride*0]= (a+c); | |
1579 block[stride*0 + xStride*1]= (e+b); | |
1580 block[stride*1 + xStride*0]= (a-c); | |
1581 block[stride*1 + xStride*1]= (e-b); | |
1582 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1583 #endif |
1168 | 1584 |
1585 /** | |
1586 * gets the chroma qp. | |
1587 */ | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
1588 static inline int get_chroma_qp(H264Context *h, int t, int qscale){ |
7347
612a78c3b128
qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents:
7346
diff
changeset
|
1589 return h->pps.chroma_qp_table[t][qscale]; |
1168 | 1590 } |
1591 | |
6488 | 1592 //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
|
1593 //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
|
1594 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){ |
1168 | 1595 int i; |
1596 const int * const quant_table= quant_coeff[qscale]; | |
1597 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
1598 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
1599 const unsigned int threshold2= (threshold1<<1); | |
1600 int last_non_zero; | |
1601 | |
4553
1a714d3f0233
cosmetics: Fix a common typo, sepErate --> sepArate.
diego
parents:
4546
diff
changeset
|
1602 if(separate_dc){ |
1168 | 1603 if(qscale<=18){ |
1604 //avoid overflows | |
1605 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
1606 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
1607 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1608 | |
1609 int level= block[0]*quant_coeff[qscale+18][0]; | |
1610 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1611 if(level>0){ | |
1612 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
1613 block[0]= level; | |
1614 }else{ | |
1615 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
1616 block[0]= -level; | |
1617 } | |
1618 // last_non_zero = i; | |
1619 }else{ | |
1620 block[0]=0; | |
1621 } | |
1622 }else{ | |
1623 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
1624 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
1625 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1626 | |
1627 int level= block[0]*quant_table[0]; | |
1628 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1629 if(level>0){ | |
1630 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
1631 block[0]= level; | |
1632 }else{ | |
1633 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
1634 block[0]= -level; | |
1635 } | |
1636 // last_non_zero = i; | |
1637 }else{ | |
1638 block[0]=0; | |
1639 } | |
1640 } | |
1641 last_non_zero= 0; | |
1642 i=1; | |
1643 }else{ | |
1644 last_non_zero= -1; | |
1645 i=0; | |
1646 } | |
1647 | |
1648 for(; i<16; i++){ | |
1649 const int j= scantable[i]; | |
1650 int level= block[j]*quant_table[j]; | |
1651 | |
1652 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
1653 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
1654 if(((unsigned)(level+threshold1))>threshold2){ | |
1655 if(level>0){ | |
1656 level= (bias + level)>>QUANT_SHIFT; | |
1657 block[j]= level; | |
1658 }else{ | |
1659 level= (bias - level)>>QUANT_SHIFT; | |
1660 block[j]= -level; | |
1661 } | |
1662 last_non_zero = i; | |
1663 }else{ | |
1664 block[j]=0; | |
1665 } | |
1666 } | |
1667 | |
1668 return last_non_zero; | |
1669 } | |
1670 | |
1671 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
1672 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1673 int src_x_offset, int src_y_offset, | |
1674 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
1675 MpegEncContext * const s = &h->s; | |
1676 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
3316 | 1677 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; |
1168 | 1678 const int luma_xy= (mx&3) + ((my&3)<<2); |
3316 | 1679 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize; |
1680 uint8_t * src_cb, * src_cr; | |
1681 int extra_width= h->emu_edge_width; | |
1682 int extra_height= h->emu_edge_height; | |
1168 | 1683 int emu=0; |
1684 const int full_mx= mx>>2; | |
1685 const int full_my= my>>2; | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
1686 const int pic_width = 16*s->mb_width; |
5815 | 1687 const int pic_height = 16*s->mb_height >> MB_FIELD; |
2967 | 1688 |
7374 | 1689 if(!pic->data[0]) //FIXME this is unacceptable, some sensible error concealment must be done for missing reference frames |
3125 | 1690 return; |
2967 | 1691 |
1168 | 1692 if(mx&7) extra_width -= 3; |
1693 if(my&7) extra_height -= 3; | |
2967 | 1694 |
1695 if( full_mx < 0-extra_width | |
1696 || full_my < 0-extra_height | |
1697 || full_mx + 16/*FIXME*/ > pic_width + extra_width | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
1698 || full_my + 16/*FIXME*/ > pic_height + extra_height){ |
3316 | 1699 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); |
1700 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize; | |
1168 | 1701 emu=1; |
1702 } | |
2967 | 1703 |
3316 | 1704 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps? |
1168 | 1705 if(!square){ |
3316 | 1706 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize); |
1168 | 1707 } |
2967 | 1708 |
5434 | 1709 if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return; |
2967 | 1710 |
5815 | 1711 if(MB_FIELD){ |
3316 | 1712 // chroma offset when predicting from a field of opposite parity |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
1713 my += 2 * ((s->mb_y & 1) - (pic->reference - 1)); |
3316 | 1714 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); |
1715 } | |
1716 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
1717 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
1168 | 1718 |
1719 if(emu){ | |
3316 | 1720 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); |
1721 src_cb= s->edge_emu_buffer; | |
1722 } | |
1723 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7); | |
1724 | |
1725 if(emu){ | |
1726 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 | 1727 src_cr= s->edge_emu_buffer; |
1728 } | |
3316 | 1729 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7); |
1168 | 1730 } |
1731 | |
2415 | 1732 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
1168 | 1733 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1734 int x_offset, int y_offset, | |
1735 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
1736 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
1737 int list0, int list1){ | |
1738 MpegEncContext * const s = &h->s; | |
1739 qpel_mc_func *qpix_op= qpix_put; | |
1740 h264_chroma_mc_func chroma_op= chroma_put; | |
2967 | 1741 |
3316 | 1742 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
1743 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
1744 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
1168 | 1745 x_offset += 8*s->mb_x; |
5815 | 1746 y_offset += 8*(s->mb_y >> MB_FIELD); |
2967 | 1747 |
1168 | 1748 if(list0){ |
1169 | 1749 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 1750 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
1751 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
1752 qpix_op, chroma_op); | |
1753 | |
1754 qpix_op= qpix_avg; | |
1755 chroma_op= chroma_avg; | |
1756 } | |
1757 | |
1758 if(list1){ | |
1169 | 1759 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 1760 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
1761 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
1762 qpix_op, chroma_op); | |
1763 } | |
1764 } | |
1765 | |
2415 | 1766 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
1767 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1768 int x_offset, int y_offset, | |
1769 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
1770 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
1771 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
1772 int list0, int list1){ | |
1773 MpegEncContext * const s = &h->s; | |
1774 | |
3316 | 1775 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
1776 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
1777 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
2415 | 1778 x_offset += 8*s->mb_x; |
5815 | 1779 y_offset += 8*(s->mb_y >> MB_FIELD); |
2967 | 1780 |
2415 | 1781 if(list0 && list1){ |
1782 /* don't optimize for luma-only case, since B-frames usually | |
1783 * use implicit weights => chroma too. */ | |
1784 uint8_t *tmp_cb = s->obmc_scratchpad; | |
3316 | 1785 uint8_t *tmp_cr = s->obmc_scratchpad + 8; |
1786 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize; | |
2415 | 1787 int refn0 = h->ref_cache[0][ scan8[n] ]; |
1788 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
1789 | |
1790 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
1791 dest_y, dest_cb, dest_cr, | |
1792 x_offset, y_offset, qpix_put, chroma_put); | |
1793 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
1794 tmp_y, tmp_cb, tmp_cr, | |
1795 x_offset, y_offset, qpix_put, chroma_put); | |
1796 | |
1797 if(h->use_weight == 2){ | |
1798 int weight0 = h->implicit_weight[refn0][refn1]; | |
1799 int weight1 = 64 - weight0; | |
3316 | 1800 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0); |
1801 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
1802 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
2415 | 1803 }else{ |
3316 | 1804 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom, |
2967 | 1805 h->luma_weight[0][refn0], h->luma_weight[1][refn1], |
3029 | 1806 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]); |
3316 | 1807 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2967 | 1808 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], |
3029 | 1809 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]); |
3316 | 1810 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2967 | 1811 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], |
3029 | 1812 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]); |
2415 | 1813 } |
1814 }else{ | |
1815 int list = list1 ? 1 : 0; | |
1816 int refn = h->ref_cache[list][ scan8[n] ]; | |
1817 Picture *ref= &h->ref_list[list][refn]; | |
1818 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
1819 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
1820 qpix_put, chroma_put); | |
1821 | |
3316 | 1822 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom, |
2415 | 1823 h->luma_weight[list][refn], h->luma_offset[list][refn]); |
1824 if(h->use_weight_chroma){ | |
3316 | 1825 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2415 | 1826 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); |
3316 | 1827 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2415 | 1828 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); |
1829 } | |
1830 } | |
1831 } | |
1832 | |
1833 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
1834 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1835 int x_offset, int y_offset, | |
1836 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
1837 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2967 | 1838 h264_weight_func *weight_op, h264_biweight_func *weight_avg, |
2415 | 1839 int list0, int list1){ |
1840 if((h->use_weight==2 && list0 && list1 | |
1841 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
1842 || h->use_weight==1) | |
1843 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
1844 x_offset, y_offset, qpix_put, chroma_put, | |
1845 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
1846 else | |
1847 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
1848 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
1849 } | |
1850 | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1851 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
|
1852 /* fetch pixels for estimated mv 4 macroblocks ahead |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1853 * optimized for 64byte cache lines */ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1854 MpegEncContext * const s = &h->s; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1855 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
|
1856 if(refn >= 0){ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1857 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
|
1858 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
|
1859 uint8_t **src= h->ref_list[list][refn].data; |
3316 | 1860 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
|
1861 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
|
1862 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
|
1863 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
|
1864 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1865 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1866 |
1168 | 1867 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1868 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2415 | 1869 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
1870 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
1168 | 1871 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
1872 const int mb_xy= h->mb_xy; |
1168 | 1873 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2967 | 1874 |
1168 | 1875 assert(IS_INTER(mb_type)); |
2967 | 1876 |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1877 prefetch_motion(h, 0); |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1878 |
1168 | 1879 if(IS_16X16(mb_type)){ |
1880 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
1881 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
2415 | 1882 &weight_op[0], &weight_avg[0], |
1168 | 1883 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
1884 }else if(IS_16X8(mb_type)){ | |
1885 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
1886 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 1887 &weight_op[1], &weight_avg[1], |
1168 | 1888 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
1889 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
1890 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 1891 &weight_op[1], &weight_avg[1], |
1168 | 1892 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
1893 }else if(IS_8X16(mb_type)){ | |
3316 | 1894 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, |
1168 | 1895 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 1896 &weight_op[2], &weight_avg[2], |
1168 | 1897 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
3316 | 1898 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, |
1168 | 1899 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 1900 &weight_op[2], &weight_avg[2], |
1168 | 1901 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
1902 }else{ | |
1903 int i; | |
2967 | 1904 |
1168 | 1905 assert(IS_8X8(mb_type)); |
1906 | |
1907 for(i=0; i<4; i++){ | |
1908 const int sub_mb_type= h->sub_mb_type[i]; | |
1909 const int n= 4*i; | |
1910 int x_offset= (i&1)<<2; | |
1911 int y_offset= (i&2)<<1; | |
1912 | |
1913 if(IS_SUB_8X8(sub_mb_type)){ | |
1914 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
1915 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 1916 &weight_op[3], &weight_avg[3], |
1168 | 1917 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
1918 }else if(IS_SUB_8X4(sub_mb_type)){ | |
1919 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
1920 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 1921 &weight_op[4], &weight_avg[4], |
1168 | 1922 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
1923 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
1924 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 1925 &weight_op[4], &weight_avg[4], |
1168 | 1926 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
1927 }else if(IS_SUB_4X8(sub_mb_type)){ | |
3316 | 1928 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, |
1168 | 1929 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 1930 &weight_op[5], &weight_avg[5], |
1168 | 1931 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3316 | 1932 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, |
1168 | 1933 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 1934 &weight_op[5], &weight_avg[5], |
1168 | 1935 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
1936 }else{ | |
1937 int j; | |
1938 assert(IS_SUB_4X4(sub_mb_type)); | |
1939 for(j=0; j<4; j++){ | |
1940 int sub_x_offset= x_offset + 2*(j&1); | |
1941 int sub_y_offset= y_offset + (j&2); | |
1942 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
1943 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 1944 &weight_op[6], &weight_avg[6], |
1168 | 1945 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
1946 } | |
1947 } | |
1948 } | |
1949 } | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1950 |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
1951 prefetch_motion(h, 1); |
1168 | 1952 } |
1953 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6490
diff
changeset
|
1954 static av_cold void decode_init_vlc(void){ |
1168 | 1955 static int done = 0; |
1956 | |
1957 if (!done) { | |
1958 int i; | |
7481 | 1959 int offset; |
1168 | 1960 done = 1; |
1961 | |
7481 | 1962 chroma_dc_coeff_token_vlc.table = chroma_dc_coeff_token_vlc_table; |
1963 chroma_dc_coeff_token_vlc.table_allocated = chroma_dc_coeff_token_vlc_table_size; | |
2967 | 1964 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, |
1168 | 1965 &chroma_dc_coeff_token_len [0], 1, 1, |
7481 | 1966 &chroma_dc_coeff_token_bits[0], 1, 1, |
1967 INIT_VLC_USE_NEW_STATIC); | |
1968 | |
1969 offset = 0; | |
1168 | 1970 for(i=0; i<4; i++){ |
7481 | 1971 coeff_token_vlc[i].table = coeff_token_vlc_tables+offset; |
1972 coeff_token_vlc[i].table_allocated = coeff_token_vlc_tables_size[i]; | |
2967 | 1973 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, |
1168 | 1974 &coeff_token_len [i][0], 1, 1, |
7481 | 1975 &coeff_token_bits[i][0], 1, 1, |
1976 INIT_VLC_USE_NEW_STATIC); | |
1977 offset += coeff_token_vlc_tables_size[i]; | |
1978 } | |
1979 /* | |
1980 * This is a one time safety check to make sure that | |
1981 * the packed static coeff_token_vlc table sizes | |
1982 * were initialized correctly. | |
1983 */ | |
1984 assert(offset == sizeof(coeff_token_vlc_tables)/(sizeof(VLC_TYPE)*2)); | |
1168 | 1985 |
1986 for(i=0; i<3; i++){ | |
7481 | 1987 chroma_dc_total_zeros_vlc[i].table = chroma_dc_total_zeros_vlc_tables[i]; |
1988 chroma_dc_total_zeros_vlc[i].table_allocated = chroma_dc_total_zeros_vlc_tables_size; | |
1989 init_vlc(&chroma_dc_total_zeros_vlc[i], | |
1990 CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
1168 | 1991 &chroma_dc_total_zeros_len [i][0], 1, 1, |
7481 | 1992 &chroma_dc_total_zeros_bits[i][0], 1, 1, |
1993 INIT_VLC_USE_NEW_STATIC); | |
1168 | 1994 } |
1995 for(i=0; i<15; i++){ | |
7481 | 1996 total_zeros_vlc[i].table = total_zeros_vlc_tables[i]; |
1997 total_zeros_vlc[i].table_allocated = total_zeros_vlc_tables_size; | |
1998 init_vlc(&total_zeros_vlc[i], | |
1999 TOTAL_ZEROS_VLC_BITS, 16, | |
1168 | 2000 &total_zeros_len [i][0], 1, 1, |
7481 | 2001 &total_zeros_bits[i][0], 1, 1, |
2002 INIT_VLC_USE_NEW_STATIC); | |
1168 | 2003 } |
2004 | |
2005 for(i=0; i<6; i++){ | |
7481 | 2006 run_vlc[i].table = run_vlc_tables[i]; |
2007 run_vlc[i].table_allocated = run_vlc_tables_size; | |
2008 init_vlc(&run_vlc[i], | |
2009 RUN_VLC_BITS, 7, | |
1168 | 2010 &run_len [i][0], 1, 1, |
7481 | 2011 &run_bits[i][0], 1, 1, |
2012 INIT_VLC_USE_NEW_STATIC); | |
2013 } | |
2014 run7_vlc.table = run7_vlc_table, | |
2015 run7_vlc.table_allocated = run7_vlc_table_size; | |
2967 | 2016 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, |
1168 | 2017 &run_len [6][0], 1, 1, |
7481 | 2018 &run_bits[6][0], 1, 1, |
2019 INIT_VLC_USE_NEW_STATIC); | |
1168 | 2020 } |
2021 } | |
2022 | |
2023 static void free_tables(H264Context *h){ | |
5079 | 2024 int i; |
5642 | 2025 H264Context *hx; |
1168 | 2026 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
|
2027 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
|
2028 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
|
2029 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
|
2030 av_freep(&h->mvd_table[1]); |
2396 | 2031 av_freep(&h->direct_table); |
1168 | 2032 av_freep(&h->non_zero_count); |
2033 av_freep(&h->slice_table_base); | |
2034 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
|
2035 |
1168 | 2036 av_freep(&h->mb2b_xy); |
2037 av_freep(&h->mb2b8_xy); | |
2415 | 2038 |
5079 | 2039 for(i = 0; i < MAX_SPS_COUNT; i++) |
2040 av_freep(h->sps_buffers + i); | |
2041 | |
2042 for(i = 0; i < MAX_PPS_COUNT; i++) | |
2043 av_freep(h->pps_buffers + i); | |
5642 | 2044 |
2045 for(i = 0; i < h->s.avctx->thread_count; i++) { | |
2046 hx = h->thread_context[i]; | |
2047 if(!hx) continue; | |
2048 av_freep(&hx->top_borders[1]); | |
2049 av_freep(&hx->top_borders[0]); | |
2050 av_freep(&hx->s.obmc_scratchpad); | |
2051 } | |
1168 | 2052 } |
2053 | |
2919 | 2054 static void init_dequant8_coeff_table(H264Context *h){ |
2055 int i,q,x; | |
3174 | 2056 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly |
2919 | 2057 h->dequant8_coeff[0] = h->dequant8_buffer[0]; |
2058 h->dequant8_coeff[1] = h->dequant8_buffer[1]; | |
2059 | |
2060 for(i=0; i<2; i++ ){ | |
2061 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){ | |
2062 h->dequant8_coeff[1] = h->dequant8_buffer[0]; | |
2063 break; | |
2064 } | |
2065 | |
2066 for(q=0; q<52; q++){ | |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2067 int shift = ff_div6[q]; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2068 int idx = ff_rem6[q]; |
2919 | 2069 for(x=0; x<64; x++) |
3174 | 2070 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = |
2071 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * | |
2072 h->pps.scaling_matrix8[i][x]) << shift; | |
2919 | 2073 } |
2074 } | |
2075 } | |
2076 | |
2077 static void init_dequant4_coeff_table(H264Context *h){ | |
2078 int i,j,q,x; | |
3005 | 2079 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly |
2919 | 2080 for(i=0; i<6; i++ ){ |
2081 h->dequant4_coeff[i] = h->dequant4_buffer[i]; | |
2082 for(j=0; j<i; j++){ | |
2083 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){ | |
2084 h->dequant4_coeff[i] = h->dequant4_buffer[j]; | |
2085 break; | |
2086 } | |
2087 } | |
2088 if(j<i) | |
2089 continue; | |
2090 | |
2091 for(q=0; q<52; q++){ | |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2092 int shift = ff_div6[q] + 2; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
2093 int idx = ff_rem6[q]; |
2919 | 2094 for(x=0; x<16; x++) |
3005 | 2095 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = |
2096 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * | |
2919 | 2097 h->pps.scaling_matrix4[i][x]) << shift; |
2098 } | |
2099 } | |
2100 } | |
2101 | |
2102 static void init_dequant_tables(H264Context *h){ | |
2103 int i,x; | |
2104 init_dequant4_coeff_table(h); | |
2105 if(h->pps.transform_8x8_mode) | |
2106 init_dequant8_coeff_table(h); | |
2107 if(h->sps.transform_bypass){ | |
2108 for(i=0; i<6; i++) | |
2109 for(x=0; x<16; x++) | |
2110 h->dequant4_coeff[i][0][x] = 1<<6; | |
2111 if(h->pps.transform_8x8_mode) | |
2112 for(i=0; i<2; i++) | |
2113 for(x=0; x<64; x++) | |
2114 h->dequant8_coeff[i][0][x] = 1<<6; | |
2115 } | |
2116 } | |
2117 | |
2118 | |
1168 | 2119 /** |
2120 * allocates tables. | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2121 * needs width/height |
1168 | 2122 */ |
2123 static int alloc_tables(H264Context *h){ | |
2124 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
|
2125 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
2919 | 2126 int x,y; |
1168 | 2127 |
2128 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
|
2129 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2130 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
3316 | 2131 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t)) |
2336 | 2132 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
1168 | 2133 |
6213
b26ccd688817
Indention, it seems i have forgotton to commit this.
michael
parents:
6203
diff
changeset
|
2134 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
b26ccd688817
Indention, it seems i have forgotton to commit this.
michael
parents:
6203
diff
changeset
|
2135 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t)); |
b26ccd688817
Indention, it seems i have forgotton to commit this.
michael
parents:
6203
diff
changeset
|
2136 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
b26ccd688817
Indention, it seems i have forgotton to commit this.
michael
parents:
6203
diff
changeset
|
2137 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
|
2138 |
3316 | 2139 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t)); |
2140 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; | |
1168 | 2141 |
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2142 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
|
2143 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
1168 | 2144 for(y=0; y<s->mb_height; y++){ |
2145 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
|
2146 const int mb_xy= x + y*s->mb_stride; |
1168 | 2147 const int b_xy = 4*x + 4*y*h->b_stride; |
2148 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
2967 | 2149 |
1168 | 2150 h->mb2b_xy [mb_xy]= b_xy; |
2151 h->mb2b8_xy[mb_xy]= b8_xy; | |
2152 } | |
2153 } | |
2415 | 2154 |
2417 | 2155 s->obmc_scratchpad = NULL; |
2156 | |
2920 | 2157 if(!h->dequant4_coeff[0]) |
2158 init_dequant_tables(h); | |
2159 | |
1168 | 2160 return 0; |
2161 fail: | |
2162 free_tables(h); | |
2163 return -1; | |
2164 } | |
2165 | |
5642 | 2166 /** |
2167 * Mimic alloc_tables(), but for every context thread. | |
2168 */ | |
2169 static void clone_tables(H264Context *dst, H264Context *src){ | |
2170 dst->intra4x4_pred_mode = src->intra4x4_pred_mode; | |
2171 dst->non_zero_count = src->non_zero_count; | |
2172 dst->slice_table = src->slice_table; | |
2173 dst->cbp_table = src->cbp_table; | |
2174 dst->mb2b_xy = src->mb2b_xy; | |
2175 dst->mb2b8_xy = src->mb2b8_xy; | |
2176 dst->chroma_pred_mode_table = src->chroma_pred_mode_table; | |
2177 dst->mvd_table[0] = src->mvd_table[0]; | |
2178 dst->mvd_table[1] = src->mvd_table[1]; | |
2179 dst->direct_table = src->direct_table; | |
2180 | |
2181 dst->s.obmc_scratchpad = NULL; | |
2182 ff_h264_pred_init(&dst->hpc, src->s.codec_id); | |
2183 } | |
2184 | |
2185 /** | |
2186 * Init context | |
2187 * Allocate buffers which are not shared amongst multiple threads. | |
2188 */ | |
2189 static int context_init(H264Context *h){ | |
2190 CHECKED_ALLOCZ(h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t)) | |
2191 CHECKED_ALLOCZ(h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t)) | |
2192 | |
2193 return 0; | |
2194 fail: | |
2195 return -1; // free_tables will clean up for us | |
2196 } | |
2197 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6490
diff
changeset
|
2198 static av_cold void common_init(H264Context *h){ |
1168 | 2199 MpegEncContext * const s = &h->s; |
2200 | |
2201 s->width = s->avctx->width; | |
2202 s->height = s->avctx->height; | |
2203 s->codec_id= s->avctx->codec->id; | |
2967 | 2204 |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2205 ff_h264_pred_init(&h->hpc, s->codec_id); |
1168 | 2206 |
2919 | 2207 h->dequant_coeff_pps= -1; |
1698 | 2208 s->unrestricted_mv=1; |
1168 | 2209 s->decode=1; //FIXME |
2920 | 2210 |
2211 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t)); | |
2212 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
1168 | 2213 } |
2214 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6490
diff
changeset
|
2215 static av_cold int decode_init(AVCodecContext *avctx){ |
1168 | 2216 H264Context *h= avctx->priv_data; |
2217 MpegEncContext * const s = &h->s; | |
2218 | |
1892 | 2219 MPV_decode_defaults(s); |
2967 | 2220 |
1168 | 2221 s->avctx = avctx; |
2222 common_init(h); | |
2223 | |
2224 s->out_format = FMT_H264; | |
2225 s->workaround_bugs= avctx->workaround_bugs; | |
2226 | |
2227 // set defaults | |
2228 // s->decode_mb= ff_h263_decode_mb; | |
5338
5c1695f0f3e4
fix visual painting of MVs from h264: they are painted twice too long
gpoirier
parents:
5262
diff
changeset
|
2229 s->quarter_sample = 1; |
1168 | 2230 s->low_delay= 1; |
7289 | 2231 |
2232 if(avctx->codec_id == CODEC_ID_SVQ3) | |
2233 avctx->pix_fmt= PIX_FMT_YUVJ420P; | |
2234 else | |
7290 | 2235 avctx->pix_fmt= PIX_FMT_YUV420P; |
1168 | 2236 |
4164
171e768324cd
Remove the H264Context parameter from decode_init_vlc() as it is not being used.
takis
parents:
4118
diff
changeset
|
2237 decode_init_vlc(); |
2967 | 2238 |
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2239 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
|
2240 *(char *)avctx->extradata == 1){ |
2227 | 2241 h->is_avc = 1; |
2242 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
|
2243 } else { |
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2244 h->is_avc = 0; |
2227 | 2245 } |
2246 | |
5642 | 2247 h->thread_context[0] = h; |
7424
69766900be2d
Initialize outputed_poc to INT_MIN at decoder initialization.
heydowns
parents:
7423
diff
changeset
|
2248 h->outputed_poc = INT_MIN; |
1168 | 2249 return 0; |
2250 } | |
2251 | |
2935 | 2252 static int frame_start(H264Context *h){ |
1168 | 2253 MpegEncContext * const s = &h->s; |
2254 int i; | |
2255 | |
2935 | 2256 if(MPV_frame_start(s, s->avctx) < 0) |
2257 return -1; | |
1168 | 2258 ff_er_frame_start(s); |
5773
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2259 /* |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2260 * MPV_frame_start uses pict_type to derive key_frame. |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2261 * This is incorrect for H.264; IDR markings must be used. |
7374 | 2262 * Zero here; IDR markings per slice in frame or fields are ORed in later. |
5773
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2263 * See decode_nal_units(). |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2264 */ |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
2265 s->current_picture_ptr->key_frame= 0; |
1168 | 2266 |
2267 assert(s->linesize && s->uvlinesize); | |
2268 | |
2269 for(i=0; i<16; i++){ | |
2270 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
|
2271 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
1168 | 2272 } |
2273 for(i=0; i<4; i++){ | |
2274 h->block_offset[16+i]= | |
2275 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
|
2276 h->block_offset[24+16+i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2277 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
1168 | 2278 } |
2279 | |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2280 /* 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
|
2281 * FIXME: redo bipred weight to not require extra buffer? */ |
5642 | 2282 for(i = 0; i < s->avctx->thread_count; i++) |
2283 if(!h->thread_context[i]->s.obmc_scratchpad) | |
2284 h->thread_context[i]->s.obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize); | |
3316 | 2285 |
2286 /* some macroblocks will be accessed before they're available */ | |
5642 | 2287 if(FRAME_MBAFF || s->avctx->thread_count > 1) |
3316 | 2288 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
|
2289 |
1168 | 2290 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
7318 | 2291 |
7374 | 2292 // We mark the current picture as non-reference after allocating it, so |
7318 | 2293 // that if we break out due to an error it can be released automatically |
2294 // in the next MPV_frame_start(). | |
2295 // SVQ3 as well as most other codecs have only last/next/current and thus | |
2296 // get released even with set reference, besides SVQ3 and others do not | |
2297 // mark frames as reference later "naturally". | |
2298 if(s->codec_id != CODEC_ID_SVQ3) | |
2299 s->current_picture_ptr->reference= 0; | |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
2300 |
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
2301 s->current_picture_ptr->field_poc[0]= |
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
2302 s->current_picture_ptr->field_poc[1]= INT_MAX; |
7386
00b1f0ecb386
Assert that long_ref has been cleared for released pics.
michael
parents:
7385
diff
changeset
|
2303 assert(s->current_picture_ptr->long_ref==0); |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
2304 |
2935 | 2305 return 0; |
1168 | 2306 } |
2307 | |
5106 | 2308 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
|
2309 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
|
2310 int i; |
2967 | 2311 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2312 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
|
2313 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
|
2314 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
|
2315 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2316 // 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
|
2317 // 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
|
2318 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
|
2319 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
|
2320 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
|
2321 } |
2967 | 2322 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2323 *(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
|
2324 *(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
|
2325 |
5434 | 2326 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2327 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
|
2328 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
|
2329 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
|
2330 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
|
2331 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
|
2332 } |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2333 *(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
|
2334 *(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
|
2335 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2336 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2337 |
5106 | 2338 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
|
2339 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
|
2340 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
|
2341 uint64_t temp64; |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2342 int deblock_left; |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2343 int deblock_top; |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2344 int mb_xy; |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2345 |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2346 if(h->deblocking_filter == 2) { |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
2347 mb_xy = h->mb_xy; |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2348 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
|
2349 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
|
2350 } else { |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2351 deblock_left = (s->mb_x > 0); |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2352 deblock_top = (s->mb_y > 0); |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
2353 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2354 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2355 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
|
2356 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
|
2357 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
|
2358 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2359 #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
|
2360 t= a;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2361 if(xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2362 a= b;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2363 b= t; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2364 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2365 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2366 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
|
2367 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
|
2368 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2369 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2370 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2371 if(deblock_top){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2372 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
|
2373 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
2803 | 2374 if(s->mb_x+1 < s->mb_width){ |
2755 | 2375 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); |
2376 } | |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2377 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2378 |
5434 | 2379 if(simple || !ENABLE_GRAY || !(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
|
2380 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2381 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
|
2382 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
|
2383 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
|
2384 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2385 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2386 if(deblock_top){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2387 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
|
2388 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
|
2389 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2390 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2391 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2392 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2393 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
|
2394 MpegEncContext * const s = &h->s; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2395 int i; |
2967 | 2396 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2397 src_y -= 2 * linesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2398 src_cb -= 2 * uvlinesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2399 src_cr -= 2 * uvlinesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2400 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2401 // 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
|
2402 // 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
|
2403 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
|
2404 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
|
2405 for(i=2; i<34; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2406 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
|
2407 } |
2967 | 2408 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2409 *(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
|
2410 *(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
|
2411 *(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
|
2412 *(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
|
2413 |
5434 | 2414 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2415 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
|
2416 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
|
2417 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
|
2418 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
|
2419 for(i=2; i<18; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2420 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
|
2421 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
|
2422 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2423 *(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
|
2424 *(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
|
2425 *(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
|
2426 *(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
|
2427 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2428 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2429 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2430 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
|
2431 MpegEncContext * const s = &h->s; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2432 int temp8, i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2433 uint64_t temp64; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2434 int deblock_left = (s->mb_x > 0); |
3316 | 2435 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
|
2436 |
4600 | 2437 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
|
2438 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2439 src_y -= 2 * linesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2440 src_cb -= 2 * uvlinesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2441 src_cr -= 2 * uvlinesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2442 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2443 #define XCHG(a,b,t,xchg)\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2444 t= a;\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2445 if(xchg)\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2446 a= b;\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2447 b= t; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2448 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2449 if(deblock_left){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2450 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
|
2451 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
|
2452 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2453 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2454 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2455 if(deblock_top){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2456 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
|
2457 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
|
2458 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
|
2459 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1); |
3316 | 2460 if(s->mb_x+1 < s->mb_width){ |
2461 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
2462 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1); | |
2463 } | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2464 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2465 |
5434 | 2466 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2467 if(deblock_left){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2468 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
|
2469 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
|
2470 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
|
2471 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2472 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2473 if(deblock_top){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2474 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
|
2475 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
|
2476 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
|
2477 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
|
2478 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2479 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2480 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2481 |
4908
777f250df232
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
2482 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ |
1168 | 2483 MpegEncContext * const s = &h->s; |
2484 const int mb_x= s->mb_x; | |
2485 const int mb_y= s->mb_y; | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
2486 const int mb_xy= h->mb_xy; |
1168 | 2487 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2488 uint8_t *dest_y, *dest_cb, *dest_cr; | |
2489 int linesize, uvlinesize /*dct_offset*/; | |
2490 int i; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2491 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
|
2492 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
|
2493 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass), is_h264 = (simple || s->codec_id == CODEC_ID_H264); |
2763 | 2494 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
|
2495 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride); |
1168 | 2496 |
2497 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
2498 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2499 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2500 | |
4000 | 2501 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4); |
2502 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2); | |
2503 | |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2504 if (!simple && MB_FIELD) { |
3316 | 2505 linesize = h->mb_linesize = s->linesize * 2; |
2506 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
|
2507 block_offset = &h->block_offset[24]; |
7374 | 2508 if(mb_y&1){ //FIXME move out of this function? |
1168 | 2509 dest_y -= s->linesize*15; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2510 dest_cb-= s->uvlinesize*7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2511 dest_cr-= s->uvlinesize*7; |
1168 | 2512 } |
3316 | 2513 if(FRAME_MBAFF) { |
2514 int list; | |
4533 | 2515 for(list=0; list<h->list_count; list++){ |
3316 | 2516 if(!USES_LIST(mb_type, list)) |
2517 continue; | |
2518 if(IS_16X16(mb_type)){ | |
2519 int8_t *ref = &h->ref_cache[list][scan8[0]]; | |
6203 | 2520 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1); |
3316 | 2521 }else{ |
2522 for(i=0; i<16; i+=4){ | |
2523 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ? | |
2524 int ref = h->ref_cache[list][scan8[i]]; | |
2525 if(ref >= 0) | |
6203 | 2526 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, (16+ref)^(s->mb_y&1), 1); |
3316 | 2527 } |
2528 } | |
2529 } | |
2530 } | |
1168 | 2531 } else { |
3316 | 2532 linesize = h->mb_linesize = s->linesize; |
2533 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
1168 | 2534 // dct_offset = s->linesize * 16; |
2535 } | |
2967 | 2536 |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2537 if(transform_bypass){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2538 idct_dc_add = |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2539 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
|
2540 }else if(IS_8x8DCT(mb_type)){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2541 idct_dc_add = s->dsp.h264_idct8_dc_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2542 idct_add = s->dsp.h264_idct8_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2543 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2544 idct_dc_add = s->dsp.h264_idct_dc_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2545 idct_add = s->dsp.h264_idct_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2546 } |
1168 | 2547 |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2548 if(!simple && FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type) |
3316 | 2549 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){ |
2550 int mbt_y = mb_y&~1; | |
2551 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16; | |
2552 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
2553 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
2554 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1); | |
2555 } | |
2556 | |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2557 if (!simple && IS_INTRA_PCM(mb_type)) { |
7450 | 2558 for (i=0; i<16; i++) { |
2559 memcpy(dest_y + i* linesize, h->mb + i*8, 16); | |
2560 } | |
2561 for (i=0; i<8; i++) { | |
2562 memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8); | |
2563 memcpy(dest_cr+ i*uvlinesize, h->mb + 160 + i*4, 8); | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2564 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2565 } else { |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2566 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
|
2567 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
5106 | 2568 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
|
2569 |
5434 | 2570 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2571 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); |
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2572 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2573 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2574 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2575 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
|
2576 if(simple || !s->encoding){ |
2755 | 2577 if(IS_8x8DCT(mb_type)){ |
2578 for(i=0; i<16; i+=4){ | |
2579 uint8_t * const ptr= dest_y + block_offset[i]; | |
2580 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
|
2581 const int nnz = h->non_zero_count_cache[ scan8[i] ]; |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2582 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, |
4546 | 2583 (h->topright_samples_available<<i)&0x4000, linesize); |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2584 if(nnz){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2585 if(nnz == 1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2586 idct_dc_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2587 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2588 idct_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2589 } |
2755 | 2590 } |
2591 }else | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2592 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
|
2593 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
|
2594 uint8_t *topright; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2595 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
|
2596 int nnz, tr; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2597 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2598 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
|
2599 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
|
2600 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
|
2601 if(!topright_avail){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2602 tr= ptr[3 - linesize]*0x01010101; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2603 topright= (uint8_t*) &tr; |
2967 | 2604 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2605 topright= ptr + 4 - linesize; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2606 }else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2607 topright= NULL; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2608 |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2609 h->hpc.pred4x4[ dir ](ptr, topright, linesize); |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2610 nnz = h->non_zero_count_cache[ scan8[i] ]; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2611 if(nnz){ |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2612 if(is_h264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2613 if(nnz == 1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2614 idct_dc_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2615 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2616 idct_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2617 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2618 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
|
2619 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2620 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2621 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2622 }else{ |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
2623 h->hpc.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
|
2624 if(is_h264){ |
2763 | 2625 if(!transform_bypass) |
5727 | 2626 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]); |
2763 | 2627 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2628 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
|
2629 } |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2630 if(h->deblocking_filter && (simple || !FRAME_MBAFF)) |
5106 | 2631 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
|
2632 }else if(is_h264){ |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2633 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
|
2634 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
|
2635 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
|
2636 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
|
2637 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2638 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2639 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2640 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
|
2641 if(is_h264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2642 if(IS_INTRA16x16(mb_type)){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2643 for(i=0; i<16; i++){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2644 if(h->non_zero_count_cache[ scan8[i] ]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2645 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
|
2646 else if(h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2647 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
|
2648 } |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2649 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2650 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2651 for(i=0; i<16; i+=di){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2652 int nnz = h->non_zero_count_cache[ scan8[i] ]; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2653 if(nnz){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2654 if(nnz==1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2655 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
|
2656 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2657 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
|
2658 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2659 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2660 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2661 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2662 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
|
2663 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
|
2664 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
|
2665 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1234 | 2666 } |
1168 | 2667 } |
2668 } | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2669 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2670 |
5434 | 2671 if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2672 uint8_t *dest[2] = {dest_cb, dest_cr}; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2673 if(transform_bypass){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2674 idct_add = idct_dc_add = s->dsp.add_pixels4; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2675 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2676 idct_add = s->dsp.h264_idct_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2677 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
|
2678 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
|
2679 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 | 2680 } |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2681 if(is_h264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2682 for(i=16; i<16+8; i++){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2683 if(h->non_zero_count_cache[ scan8[i] ]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2684 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
|
2685 else if(h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2686 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
|
2687 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2688 }else{ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
2689 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
|
2690 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
|
2691 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
|
2692 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
|
2693 } |
1250 | 2694 } |
1168 | 2695 } |
2696 } | |
2697 } | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2698 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
|
2699 if (!simple && FRAME_MBAFF) { |
3316 | 2700 //FIXME try deblocking one mb at a time? |
2701 // 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
|
2702 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
|
2703 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
|
2704 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
|
2705 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
|
2706 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
|
2707 if (!bottom) return; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2708 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
|
2709 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
|
2710 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
|
2711 |
3316 | 2712 if(IS_INTRA(mb_type_top | mb_type_bottom)) |
2713 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0); | |
2714 | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2715 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize); |
3316 | 2716 // deblock a pair |
2967 | 2717 // top |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
2718 s->mb_y--; h->mb_xy -= s->mb_stride; |
4600 | 2719 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
|
2720 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
|
2721 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
|
2722 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
|
2723 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
|
2724 // bottom |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
2725 s->mb_y++; h->mb_xy += s->mb_stride; |
4600 | 2726 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
|
2727 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
|
2728 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
|
2729 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
|
2730 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
|
2731 } else { |
4600 | 2732 tprintf(h->s.avctx, "call filter_mb\n"); |
5106 | 2733 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
|
2734 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb |
7346
def19f6f7ce9
Setting chroma_qp to 0 for PCM blocks is really an interesting minor
michael
parents:
7345
diff
changeset
|
2735 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); |
def19f6f7ce9
Setting chroma_qp to 0 for PCM blocks is really an interesting minor
michael
parents:
7345
diff
changeset
|
2736 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
2737 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
|
2738 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2739 } |
1168 | 2740 } |
2741 | |
2742 /** | |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2743 * 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
|
2744 */ |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2745 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
|
2746 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
|
2747 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2748 |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2749 /** |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2750 * 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
|
2751 */ |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2752 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
|
2753 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
|
2754 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2755 |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2756 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
|
2757 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
2758 const int mb_xy= h->mb_xy; |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2759 const int mb_type= s->current_picture.mb_type[mb_xy]; |
7185 | 2760 int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || |
2761 (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL; | |
7178
9a31b6a8ae52
Don't test for H264 encoding unless an encoder exists.
astrange
parents:
7040
diff
changeset
|
2762 |
9a31b6a8ae52
Don't test for H264 encoding unless an encoder exists.
astrange
parents:
7040
diff
changeset
|
2763 if(ENABLE_H264_ENCODER && !s->decode) |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2764 return; |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2765 |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2766 if (is_complex) |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2767 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
|
2768 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
|
2769 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
2770 |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
2771 static void pic_as_field(Picture *pic, const int parity){ |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2772 int i; |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2773 for (i = 0; i < 4; ++i) { |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
2774 if (parity == PICT_BOTTOM_FIELD) |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2775 pic->data[i] += pic->linesize[i]; |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
2776 pic->reference = parity; |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2777 pic->linesize[i] *= 2; |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2778 } |
7462
5cbf11f56c02
Picture.ref_count/ref_poc have to be stored per field (actually also per
michael
parents:
7450
diff
changeset
|
2779 pic->poc= pic->field_poc[parity == PICT_BOTTOM_FIELD]; |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2780 } |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2781 |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2782 static int split_field_copy(Picture *dest, Picture *src, |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2783 int parity, int id_add){ |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2784 int match = !!(src->reference & parity); |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2785 |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2786 if (match) { |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2787 *dest = *src; |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2788 if(parity != PICT_FRAME){ |
7399 | 2789 pic_as_field(dest, parity); |
2790 dest->pic_id *= 2; | |
2791 dest->pic_id += id_add; | |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2792 } |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2793 } |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2794 |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2795 return match; |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2796 } |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2797 |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2798 static int build_def_list(Picture *def, Picture **in, int len, int is_long, int sel){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2799 int i[2]={0}; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2800 int index=0; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2801 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2802 while(i[0]<len || i[1]<len){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2803 while(i[0]<len && !(in[ i[0] ] && (in[ i[0] ]->reference & sel))) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2804 i[0]++; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2805 while(i[1]<len && !(in[ i[1] ] && (in[ i[1] ]->reference & (sel^3)))) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2806 i[1]++; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2807 if(i[0] < len){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2808 in[ i[0] ]->pic_id= is_long ? i[0] : in[ i[0] ]->frame_num; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2809 split_field_copy(&def[index++], in[ i[0]++ ], sel , 1); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2810 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2811 if(i[1] < len){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2812 in[ i[1] ]->pic_id= is_long ? i[1] : in[ i[1] ]->frame_num; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2813 split_field_copy(&def[index++], in[ i[1]++ ], sel^3, 0); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2814 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2815 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2816 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2817 return index; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2818 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2819 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2820 static int add_sorted(Picture **sorted, Picture **src, int len, int limit, int dir){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2821 int i, best_poc; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2822 int out_i= 0; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2823 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2824 for(;;){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2825 best_poc= dir ? INT_MIN : INT_MAX; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2826 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2827 for(i=0; i<len; i++){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2828 const int poc= src[i]->poc; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2829 if(((poc > limit) ^ dir) && ((poc < best_poc) ^ dir)){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2830 best_poc= poc; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2831 sorted[out_i]= src[i]; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2832 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2833 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2834 if(best_poc == (dir ? INT_MIN : INT_MAX)) |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2835 break; |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2836 limit= sorted[out_i++]->poc - dir; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2837 } |
5778
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2838 return out_i; |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2839 } |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2840 |
c4984d69d373
Support functions and changes to default reference list creation for PAFF.
andoma
parents:
5774
diff
changeset
|
2841 /** |
1168 | 2842 * fills the default_ref_list. |
2843 */ | |
2844 static int fill_default_ref_list(H264Context *h){ | |
2845 MpegEncContext * const s = &h->s; | |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2846 int i, len; |
2967 | 2847 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
2848 if(h->slice_type_nos==FF_B_TYPE){ |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2849 Picture *sorted[32]; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2850 int cur_poc, list; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2851 int lens[2]; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2852 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2853 if(FIELD_PICTURE) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2854 cur_poc= s->current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ]; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2855 else |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2856 cur_poc= s->current_picture_ptr->poc; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2857 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2858 for(list= 0; list<2; list++){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2859 len= add_sorted(sorted , h->short_ref, h->short_ref_count, cur_poc, 1^list); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2860 len+=add_sorted(sorted+len, h->short_ref, h->short_ref_count, cur_poc, 0^list); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2861 assert(len<=32); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2862 len= build_def_list(h->default_ref_list[list] , sorted , len, 0, s->picture_structure); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2863 len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, s->picture_structure); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2864 assert(len<=32); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2865 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2866 if(len < h->ref_count[list]) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2867 memset(&h->default_ref_list[list][len], 0, sizeof(Picture)*(h->ref_count[list] - len)); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2868 lens[list]= len; |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2869 } |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2870 |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2871 if(lens[0] == lens[1] && lens[1] > 1){ |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2872 for(i=0; h->default_ref_list[0][i].data[0] == h->default_ref_list[1][i].data[0] && i<lens[0]; i++); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2873 if(i == lens[0]) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2874 FFSWAP(Picture, h->default_ref_list[1][0], h->default_ref_list[1][1]); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2875 } |
5779
ad3168a70fbe
Reindent fill_default_ref_list after changes for PAFF
andoma
parents:
5778
diff
changeset
|
2876 }else{ |
7398
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2877 len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, s->picture_structure); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2878 len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, s->picture_structure); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2879 assert(len <= 32); |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2880 if(len < h->ref_count[0]) |
bcede7e06618
Rewrite fill_default_ref_list(), the old code was obfuscated beyond
michael
parents:
7397
diff
changeset
|
2881 memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len)); |
1168 | 2882 } |
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
|
2883 #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
|
2884 for (i=0; i<h->ref_count[0]; i++) { |
4600 | 2885 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
|
2886 } |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
2887 if(h->slice_type_nos==FF_B_TYPE){ |
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
|
2888 for (i=0; i<h->ref_count[1]; i++) { |
6311
985f4195bb69
"swap first two elements of L1 if L0 and L1 are identical" applies after splitting the lists into fields
lorenm
parents:
6310
diff
changeset
|
2889 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[1][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
|
2890 } |
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
|
2891 } |
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
|
2892 #endif |
1168 | 2893 return 0; |
2894 } | |
2895 | |
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
|
2896 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
|
2897 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
|
2898 |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2899 /** |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2900 * Extract structure information about the picture described by pic_num in |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2901 * the current decoding context (frame or field). Note that pic_num is |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2902 * picture number without wrapping (so, 0<=pic_num<max_pic_num). |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2903 * @param pic_num picture number for which to extract structure information |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2904 * @param structure one of PICT_XXX describing structure of picture |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2905 * with pic_num |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2906 * @return frame number (short term) or long term index of picture |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2907 * described by pic_num |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2908 */ |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2909 static int pic_num_extract(H264Context *h, int pic_num, int *structure){ |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2910 MpegEncContext * const s = &h->s; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2911 |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2912 *structure = s->picture_structure; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2913 if(FIELD_PICTURE){ |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2914 if (!(pic_num & 1)) |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2915 /* opposite field */ |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2916 *structure ^= PICT_FRAME; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2917 pic_num >>= 1; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2918 } |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2919 |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2920 return pic_num; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2921 } |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2922 |
1168 | 2923 static int decode_ref_pic_list_reordering(H264Context *h){ |
2924 MpegEncContext * const s = &h->s; | |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2925 int list, index, pic_structure; |
2967 | 2926 |
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
|
2927 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
|
2928 print_long_term(h); |
2967 | 2929 |
4533 | 2930 for(list=0; list<h->list_count; list++){ |
1168 | 2931 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); |
2932 | |
2933 if(get_bits1(&s->gb)){ | |
2934 int pred= h->curr_pic_num; | |
2935 | |
2936 for(index=0; ; index++){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2937 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
|
2938 unsigned int pic_id; |
1168 | 2939 int i; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
2940 Picture *ref = NULL; |
2967 | 2941 |
2942 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
|
2943 break; |
2967 | 2944 |
1168 | 2945 if(index >= h->ref_count[list]){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2946 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
1168 | 2947 return -1; |
2948 } | |
2967 | 2949 |
1168 | 2950 if(reordering_of_pic_nums_idc<3){ |
2951 if(reordering_of_pic_nums_idc<2){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2952 const unsigned int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2953 int frame_num; |
1168 | 2954 |
5805 | 2955 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
|
2956 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
1168 | 2957 return -1; |
2958 } | |
2959 | |
2960 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
2961 else pred+= abs_diff_pic_num; | |
2962 pred &= h->max_pic_num - 1; | |
2967 | 2963 |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2964 frame_num = pic_num_extract(h, pred, &pic_structure); |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2965 |
2683 | 2966 for(i= h->short_ref_count-1; i>=0; i--){ |
2967 ref = h->short_ref[i]; | |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2968 assert(ref->reference); |
2683 | 2969 assert(!ref->long_ref); |
7402 | 2970 if( |
7405 | 2971 ref->frame_num == frame_num && |
2972 (ref->reference & pic_structure) | |
7402 | 2973 ) |
1168 | 2974 break; |
2975 } | |
2683 | 2976 if(i>=0) |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2977 ref->pic_id= pred; |
1168 | 2978 }else{ |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2979 int long_idx; |
1168 | 2980 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2981 |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2982 long_idx= pic_num_extract(h, pic_id, &pic_structure); |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2983 |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2984 if(long_idx>31){ |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2985 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
|
2986 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2987 } |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2988 ref = h->long_ref[long_idx]; |
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
2989 assert(!(ref && !ref->reference)); |
7405 | 2990 if(ref && (ref->reference & pic_structure)){ |
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2991 ref->pic_id= pic_id; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2992 assert(ref->long_ref); |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2993 i=0; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2994 }else{ |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2995 i=-1; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2996 } |
1168 | 2997 } |
2998 | |
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
2999 if (i < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3000 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
1168 | 3001 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
2683 | 3002 } else { |
3003 for(i=index; i+1<h->ref_count[list]; i++){ | |
3004 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
3005 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
|
3006 } |
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
|
3007 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
|
3008 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
|
3009 } |
2683 | 3010 h->ref_list[list][index]= *ref; |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
3011 if (FIELD_PICTURE){ |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
3012 pic_as_field(&h->ref_list[list][index], pic_structure); |
5780
bd3d1e4f937a
Support function and changes to reference picture reordering for PAFF.
andoma
parents:
5779
diff
changeset
|
3013 } |
1168 | 3014 } |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3015 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3016 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
1168 | 3017 return -1; |
3018 } | |
3019 } | |
3020 } | |
4533 | 3021 } |
3022 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
|
3023 for(index= 0; index < h->ref_count[list]; index++){ |
7403 | 3024 if(!h->ref_list[list][index].data[0]){ |
3025 av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n"); | |
3026 h->ref_list[list][index]= s->current_picture; //FIXME this is not a sensible solution | |
3027 } | |
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3028 } |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3029 } |
2967 | 3030 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
3031 if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred) |
2396 | 3032 direct_dist_scale_factor(h); |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3033 direct_ref_list_init(h); |
2967 | 3034 return 0; |
1168 | 3035 } |
3036 | |
3379
69901769c811
fill_mbaff_ref_list is missing a return statement, its return value
mru
parents:
3341
diff
changeset
|
3037 static void fill_mbaff_ref_list(H264Context *h){ |
3316 | 3038 int list, i, j; |
4533 | 3039 for(list=0; list<2; list++){ //FIXME try list_count |
3316 | 3040 for(i=0; i<h->ref_count[list]; i++){ |
3041 Picture *frame = &h->ref_list[list][i]; | |
3042 Picture *field = &h->ref_list[list][16+2*i]; | |
3043 field[0] = *frame; | |
3044 for(j=0; j<3; j++) | |
3045 field[0].linesize[j] <<= 1; | |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
3046 field[0].reference = PICT_TOP_FIELD; |
3316 | 3047 field[1] = field[0]; |
3048 for(j=0; j<3; j++) | |
3049 field[1].data[j] += frame->linesize[j]; | |
5825
18859ffa5705
Fix chroma mv offsets for PAFF in a way that is compatible with MBAFF by
cehoyos
parents:
5822
diff
changeset
|
3050 field[1].reference = PICT_BOTTOM_FIELD; |
3316 | 3051 |
3052 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i]; | |
3053 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i]; | |
3054 for(j=0; j<2; j++){ | |
3055 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j]; | |
3056 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j]; | |
3057 } | |
3058 } | |
3059 } | |
3060 for(j=0; j<h->ref_count[1]; j++){ | |
3061 for(i=0; i<h->ref_count[0]; i++) | |
3062 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i]; | |
3063 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
3064 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
3065 } | |
3066 } | |
3067 | |
1168 | 3068 static int pred_weight_table(H264Context *h){ |
3069 MpegEncContext * const s = &h->s; | |
3070 int list, i; | |
2415 | 3071 int luma_def, chroma_def; |
2967 | 3072 |
2415 | 3073 h->use_weight= 0; |
3074 h->use_weight_chroma= 0; | |
1168 | 3075 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
3076 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2415 | 3077 luma_def = 1<<h->luma_log2_weight_denom; |
3078 chroma_def = 1<<h->chroma_log2_weight_denom; | |
1168 | 3079 |
3080 for(list=0; list<2; list++){ | |
3081 for(i=0; i<h->ref_count[list]; i++){ | |
3082 int luma_weight_flag, chroma_weight_flag; | |
2967 | 3083 |
1168 | 3084 luma_weight_flag= get_bits1(&s->gb); |
3085 if(luma_weight_flag){ | |
3086 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
3087 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
2415 | 3088 if( h->luma_weight[list][i] != luma_def |
3089 || h->luma_offset[list][i] != 0) | |
3090 h->use_weight= 1; | |
3091 }else{ | |
3092 h->luma_weight[list][i]= luma_def; | |
3093 h->luma_offset[list][i]= 0; | |
1168 | 3094 } |
3095 | |
7407 | 3096 if(CHROMA){ |
7408 | 3097 chroma_weight_flag= get_bits1(&s->gb); |
3098 if(chroma_weight_flag){ | |
3099 int j; | |
3100 for(j=0; j<2; j++){ | |
3101 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
3102 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
3103 if( h->chroma_weight[list][i][j] != chroma_def | |
3104 || h->chroma_offset[list][i][j] != 0) | |
3105 h->use_weight_chroma= 1; | |
3106 } | |
3107 }else{ | |
3108 int j; | |
3109 for(j=0; j<2; j++){ | |
3110 h->chroma_weight[list][i][j]= chroma_def; | |
3111 h->chroma_offset[list][i][j]= 0; | |
3112 } | |
2415 | 3113 } |
7407 | 3114 } |
1168 | 3115 } |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
3116 if(h->slice_type_nos != FF_B_TYPE) break; |
1168 | 3117 } |
2415 | 3118 h->use_weight= h->use_weight || h->use_weight_chroma; |
1168 | 3119 return 0; |
3120 } | |
3121 | |
2415 | 3122 static void implicit_weight_table(H264Context *h){ |
3123 MpegEncContext * const s = &h->s; | |
3124 int ref0, ref1; | |
3125 int cur_poc = s->current_picture_ptr->poc; | |
3126 | |
3127 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
3128 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
3129 h->use_weight= 0; | |
3130 h->use_weight_chroma= 0; | |
3131 return; | |
3132 } | |
3133 | |
3134 h->use_weight= 2; | |
3135 h->use_weight_chroma= 2; | |
3136 h->luma_log2_weight_denom= 5; | |
3137 h->chroma_log2_weight_denom= 5; | |
3138 | |
3139 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
3140 int poc0 = h->ref_list[0][ref0].poc; | |
3141 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
2519 | 3142 int poc1 = h->ref_list[1][ref1].poc; |
4594 | 3143 int td = av_clip(poc1 - poc0, -128, 127); |
2415 | 3144 if(td){ |
4594 | 3145 int tb = av_clip(cur_poc - poc0, -128, 127); |
4001 | 3146 int tx = (16384 + (FFABS(td) >> 1)) / td; |
4594 | 3147 int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; |
2415 | 3148 if(dist_scale_factor < -64 || dist_scale_factor > 128) |
3149 h->implicit_weight[ref0][ref1] = 32; | |
3150 else | |
3151 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
3152 }else | |
3153 h->implicit_weight[ref0][ref1] = 32; | |
3154 } | |
3155 } | |
3156 } | |
3157 | |
5768
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3158 /** |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3159 * Mark a picture as no longer needed for reference. The refmask |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3160 * argument allows unreferencing of individual fields or the whole frame. |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3161 * If the picture becomes entirely unreferenced, but is being held for |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3162 * display purposes, it is marked as such. |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3163 * @param refmask mask of fields to unreference; the mask is bitwise |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3164 * anded with the reference marking of pic |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3165 * @return non-zero if pic becomes entirely unreferenced (except possibly |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3166 * for display purposes) zero if one of the fields remains in |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3167 * reference |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3168 */ |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3169 static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){ |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3170 int i; |
5768
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3171 if (pic->reference &= refmask) { |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3172 return 0; |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3173 } else { |
7313 | 3174 for(i = 0; h->delayed_pic[i]; i++) |
3175 if(pic == h->delayed_pic[i]){ | |
3176 pic->reference=DELAYED_PIC_REF; | |
3177 break; | |
3178 } | |
5768
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3179 return 1; |
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3180 } |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3181 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3182 |
1168 | 3183 /** |
2392 | 3184 * instantaneous decoder refresh. |
1168 | 3185 */ |
3186 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
|
3187 int i; |
1168 | 3188 |
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3189 for(i=0; i<16; i++){ |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3190 remove_long(h, i, 0); |
7385
617eababb511
Clear long_ref when a frame is no longer a long_ref.
michael
parents:
7384
diff
changeset
|
3191 } |
617eababb511
Clear long_ref when a frame is no longer a long_ref.
michael
parents:
7384
diff
changeset
|
3192 assert(h->long_ref_count==0); |
1168 | 3193 |
3194 for(i=0; i<h->short_ref_count; i++){ | |
5768
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
3195 unreference_pic(h, h->short_ref[i], 0); |
1168 | 3196 h->short_ref[i]= NULL; |
3197 } | |
3198 h->short_ref_count=0; | |
7362
443fdc440854
Reset prev_frame_num for idr frames as required by the spec.
michael
parents:
7361
diff
changeset
|
3199 h->prev_frame_num= 0; |
7379 | 3200 h->prev_frame_num_offset= 0; |
3201 h->prev_poc_msb= | |
3202 h->prev_poc_lsb= 0; | |
1168 | 3203 } |
3204 | |
2640 | 3205 /* forget old pics after a seek */ |
3206 static void flush_dpb(AVCodecContext *avctx){ | |
3207 H264Context *h= avctx->priv_data; | |
3208 int i; | |
7283
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7277
diff
changeset
|
3209 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) { |
3144 | 3210 if(h->delayed_pic[i]) |
3211 h->delayed_pic[i]->reference= 0; | |
2640 | 3212 h->delayed_pic[i]= NULL; |
3144 | 3213 } |
7310
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
3214 h->outputed_poc= INT_MIN; |
2640 | 3215 idr(h); |
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3216 if(h->s.current_picture_ptr) |
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3217 h->s.current_picture_ptr->reference= 0; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3218 h->s.first_field= 0; |
5926
77403dc808cd
Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents:
5904
diff
changeset
|
3219 ff_mpeg_flush(avctx); |
2640 | 3220 } |
3221 | |
1168 | 3222 /** |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3223 * Find a Picture in the short term reference list by frame number. |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3224 * @param frame_num frame number to search for |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3225 * @param idx the index into h->short_ref where returned picture is found |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3226 * undefined if no picture found. |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3227 * @return pointer to the found picture, or NULL if no pic with the provided |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3228 * frame number is found |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3229 */ |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3230 static Picture * find_short(H264Context *h, int frame_num, int *idx){ |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3231 MpegEncContext * const s = &h->s; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3232 int i; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3233 |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3234 for(i=0; i<h->short_ref_count; i++){ |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3235 Picture *pic= h->short_ref[i]; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3236 if(s->avctx->debug&FF_DEBUG_MMCO) |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3237 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3238 if(pic->frame_num == frame_num) { |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3239 *idx = i; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3240 return pic; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3241 } |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3242 } |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3243 return NULL; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3244 } |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3245 |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3246 /** |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3247 * Remove a picture from the short term reference list by its index in |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3248 * that list. This does no checking on the provided index; it is assumed |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3249 * to be valid. Other list entries are shifted down. |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3250 * @param i index into h->short_ref of picture to remove. |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3251 */ |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3252 static void remove_short_at_index(H264Context *h, int i){ |
7277
2bd9df0236e8
H264: fix index range assert() in remove_short_at_index()
mru
parents:
7237
diff
changeset
|
3253 assert(i >= 0 && i < h->short_ref_count); |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3254 h->short_ref[i]= NULL; |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3255 if (--h->short_ref_count) |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3256 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i)*sizeof(Picture*)); |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3257 } |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3258 |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3259 /** |
1168 | 3260 * |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3261 * @return the removed picture or NULL if an error occurs |
1168 | 3262 */ |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3263 static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){ |
1169 | 3264 MpegEncContext * const s = &h->s; |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3265 Picture *pic; |
1168 | 3266 int i; |
2967 | 3267 |
1169 | 3268 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
|
3269 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
2967 | 3270 |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3271 pic = find_short(h, frame_num, &i); |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3272 if (pic){ |
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3273 if(unreference_pic(h, pic, ref_mask)) |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3274 remove_short_at_index(h, i); |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3275 } |
5770
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3276 |
a1a947d67948
Further modularize short reference list management for upcoming PAFF implementation.
andoma
parents:
5769
diff
changeset
|
3277 return pic; |
1168 | 3278 } |
3279 | |
3280 /** | |
5774
e71de81878c4
Reorganize long reference management to minimize code duplication in upcoming PAFF implementation.
andoma
parents:
5773
diff
changeset
|
3281 * Remove a picture from the long term reference list by its index in |
7393
309c59802769
Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents:
7392
diff
changeset
|
3282 * that list. |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3283 * @return the removed picture or NULL if an error occurs |
1168 | 3284 */ |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3285 static Picture * remove_long(H264Context *h, int i, int ref_mask){ |
1168 | 3286 Picture *pic; |
3287 | |
3288 pic= h->long_ref[i]; | |
7393
309c59802769
Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents:
7392
diff
changeset
|
3289 if (pic){ |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3290 if(unreference_pic(h, pic, ref_mask)){ |
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3291 assert(h->long_ref[i]->long_ref == 1); |
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3292 h->long_ref[i]->long_ref= 0; |
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3293 h->long_ref[i]= NULL; |
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3294 h->long_ref_count--; |
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3295 } |
7393
309c59802769
Merge oddly duplicated remove_long/remove_long_at_index() function.
michael
parents:
7392
diff
changeset
|
3296 } |
1168 | 3297 |
3298 return pic; | |
3299 } | |
3300 | |
3301 /** | |
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
|
3302 * 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
|
3303 */ |
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
|
3304 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
|
3305 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
|
3306 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
|
3307 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
|
3308 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
|
3309 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
|
3310 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
|
3311 } |
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
|
3312 } |
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
|
3313 } |
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
|
3314 |
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
|
3315 /** |
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
|
3316 * 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
|
3317 */ |
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
|
3318 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
|
3319 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
|
3320 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
|
3321 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
|
3322 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
|
3323 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
|
3324 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
|
3325 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
|
3326 } |
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
|
3327 } |
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
|
3328 } |
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
|
3329 } |
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
|
3330 |
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
|
3331 /** |
1168 | 3332 * Executes the reference picture marking (memory management control operations). |
3333 */ | |
3334 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
3335 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
|
3336 int i, j; |
5785
74fa2587b8de
Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents:
5784
diff
changeset
|
3337 int current_ref_assigned=0; |
1168 | 3338 Picture *pic; |
2967 | 3339 |
1168 | 3340 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
|
3341 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
2967 | 3342 |
1168 | 3343 for(i=0; i<mmco_count; i++){ |
7383
c4e5f2158b20
Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents:
7382
diff
changeset
|
3344 int structure, frame_num; |
1168 | 3345 if(s->avctx->debug&FF_DEBUG_MMCO) |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5727
diff
changeset
|
3346 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg); |
1168 | 3347 |
7395
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3348 if( mmco[i].opcode == MMCO_SHORT2UNUSED |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3349 || mmco[i].opcode == MMCO_SHORT2LONG){ |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3350 frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure); |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3351 pic = find_short(h, frame_num, &j); |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3352 if(!pic){ |
7397
535664ced6f0
Do not scare the user with error messages when everything is ok.
michael
parents:
7396
diff
changeset
|
3353 if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg] |
535664ced6f0
Do not scare the user with error messages when everything is ok.
michael
parents:
7396
diff
changeset
|
3354 || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) |
7395
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3355 av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3356 continue; |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3357 } |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3358 } |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3359 |
1168 | 3360 switch(mmco[i].opcode){ |
3361 case MMCO_SHORT2UNUSED: | |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3362 if(s->avctx->debug&FF_DEBUG_MMCO) |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3363 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count); |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3364 remove_short(h, frame_num, structure ^ PICT_FRAME); |
1168 | 3365 break; |
3366 case MMCO_SHORT2LONG: | |
7395
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3367 if (h->long_ref[mmco[i].long_arg] != pic) |
08e81ea44a38
Removing yet another weird field pic special case,
michael
parents:
7394
diff
changeset
|
3368 remove_long(h, mmco[i].long_arg, 0); |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3369 |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3370 remove_short_at_index(h, j); |
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3371 h->long_ref[ mmco[i].long_arg ]= pic; |
5787 | 3372 if (h->long_ref[ mmco[i].long_arg ]){ |
3373 h->long_ref[ mmco[i].long_arg ]->long_ref=1; | |
3374 h->long_ref_count++; | |
3375 } | |
1168 | 3376 break; |
3377 case MMCO_LONG2UNUSED: | |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3378 j = pic_num_extract(h, mmco[i].long_arg, &structure); |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3379 pic = h->long_ref[j]; |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3380 if (pic) { |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3381 remove_long(h, j, structure ^ PICT_FRAME); |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3382 } else if(s->avctx->debug&FF_DEBUG_MMCO) |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3383 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n"); |
1168 | 3384 break; |
3385 case MMCO_LONG: | |
7383
c4e5f2158b20
Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents:
7382
diff
changeset
|
3386 // Comment below left from previous code as it is an interresting note. |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3387 /* First field in pair is in short term list or |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3388 * at a different long term index. |
7420
30e8c4bf08a4
Fix reference to spec to be more specific and correct.
heydowns
parents:
7417
diff
changeset
|
3389 * This is not allowed; see 7.4.3.3, notes 2 and 3. |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3390 * Report the problem and keep the pair where it is, |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3391 * and mark this field valid. |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3392 */ |
7383
c4e5f2158b20
Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents:
7382
diff
changeset
|
3393 |
c4e5f2158b20
Simplify strange obfuscated code in MMCO_LONG handling.
michael
parents:
7382
diff
changeset
|
3394 if (h->long_ref[mmco[i].long_arg] != s->current_picture_ptr) { |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3395 remove_long(h, mmco[i].long_arg, 0); |
5787 | 3396 |
3397 h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr; | |
3398 h->long_ref[ mmco[i].long_arg ]->long_ref=1; | |
3399 h->long_ref_count++; | |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3400 } |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3401 |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3402 s->current_picture_ptr->reference |= s->picture_structure; |
5785
74fa2587b8de
Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
andoma
parents:
5784
diff
changeset
|
3403 current_ref_assigned=1; |
1168 | 3404 break; |
3405 case MMCO_SET_MAX_LONG: | |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5727
diff
changeset
|
3406 assert(mmco[i].long_arg <= 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
|
3407 // just remove the long term which index is greater than new max |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5727
diff
changeset
|
3408 for(j = mmco[i].long_arg; j<16; j++){ |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3409 remove_long(h, j, 0); |
1168 | 3410 } |
3411 break; | |
3412 case MMCO_RESET: | |
3413 while(h->short_ref_count){ | |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3414 remove_short(h, h->short_ref[0]->frame_num, 0); |
1168 | 3415 } |
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
|
3416 for(j = 0; j < 16; j++) { |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3417 remove_long(h, j, 0); |
1168 | 3418 } |
7350 | 3419 s->current_picture_ptr->poc= |
3420 s->current_picture_ptr->field_poc[0]= | |
3421 s->current_picture_ptr->field_poc[1]= | |
3422 h->poc_lsb= | |
3423 h->poc_msb= | |
3424 h->frame_num= | |
7349 | 3425 s->current_picture_ptr->frame_num= 0; |
1168 | 3426 break; |
3427 default: assert(0); | |
3428 } | |
3429 } | |
2967 | 3430 |
7389
8ef2e8f077ff
Remove another of these obfuscated special cases for field pictures
michael
parents:
7388
diff
changeset
|
3431 if (!current_ref_assigned) { |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3432 /* Second field of complementary field pair; the first field of |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3433 * which is already referenced. If short referenced, it |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3434 * should be first entry in short_ref. If not, it must exist |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3435 * in long_ref; trying to put it on the short list here is an |
7421
74534206d329
And.... Fix another spec reference to be more specific and correct.
heydowns
parents:
7420
diff
changeset
|
3436 * error in the encoded bit stream (ref: 7.4.3.3, NOTE 2 and 3). |
5786
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3437 */ |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3438 if (h->short_ref_count && h->short_ref[0] == s->current_picture_ptr) { |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3439 /* Just mark the second field valid */ |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3440 s->current_picture_ptr->reference = PICT_FRAME; |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3441 } else if (s->current_picture_ptr->long_ref) { |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3442 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference " |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3443 "assignment for second field " |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3444 "in complementary field pair " |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3445 "(first field is long term)\n"); |
8121e27dd9cc
Augment MMCO execution to work with both fields and frames. Part of PAFF
cehoyos
parents:
5785
diff
changeset
|
3446 } else { |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3447 pic= remove_short(h, s->current_picture_ptr->frame_num, 0); |
7391 | 3448 if(pic){ |
3449 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); | |
3450 } | |
3451 | |
3452 if(h->short_ref_count) | |
3453 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); | |
3454 | |
3455 h->short_ref[0]= s->current_picture_ptr; | |
3456 h->short_ref_count++; | |
3457 s->current_picture_ptr->reference |= s->picture_structure; | |
3458 } | |
7390 | 3459 } |
2967 | 3460 |
6019 | 3461 if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){ |
6018
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3462 |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3463 /* We have too many reference frames, probably due to corrupted |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3464 * stream. Need to discard one frame. Prevents overrun of the |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3465 * short_ref and long_ref buffers. |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3466 */ |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3467 av_log(h->s.avctx, AV_LOG_ERROR, |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3468 "number of reference frames exceeds max (probably " |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3469 "corrupt input), discarding one\n"); |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3470 |
7350 | 3471 if (h->long_ref_count && !h->short_ref_count) { |
6018
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3472 for (i = 0; i < 16; ++i) |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3473 if (h->long_ref[i]) |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3474 break; |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3475 |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3476 assert(i < 16); |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3477 remove_long(h, i, 0); |
6018
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3478 } else { |
6019 | 3479 pic = h->short_ref[h->short_ref_count - 1]; |
7396
9f765ea6d6df
Make remove_short() match remove_long() in that it calls unreference_pic().
michael
parents:
7395
diff
changeset
|
3480 remove_short(h, pic->frame_num, 0); |
7394
4ac8769cbb01
Make remove_long() call unreference_pic() internally.
michael
parents:
7393
diff
changeset
|
3481 } |
6018
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
3482 } |
9d1654835629
Ensure that our total reference frame count does not exceed the SPS
heydowns
parents:
6017
diff
changeset
|
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 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
|
3485 print_long_term(h); |
2967 | 3486 return 0; |
1168 | 3487 } |
3488 | |
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
3489 static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){ |
1168 | 3490 MpegEncContext * const s = &h->s; |
3491 int i; | |
2967 | 3492 |
7384
8b9a02536781
Make sure mmco index is 0 (instead of uninitialized) in all error returns.
michael
parents:
7383
diff
changeset
|
3493 h->mmco_index= 0; |
1168 | 3494 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
|
3495 s->broken_link= get_bits1(gb) -1; |
7388 | 3496 if(get_bits1(gb)){ |
1168 | 3497 h->mmco[0].opcode= MMCO_LONG; |
7388 | 3498 h->mmco[0].long_arg= 0; |
1168 | 3499 h->mmco_index= 1; |
2967 | 3500 } |
1168 | 3501 }else{ |
5172
60a4f209838b
Decouple bit context from h264 context in decode_ref_pic_marking()
gpoirier
parents:
5170
diff
changeset
|
3502 if(get_bits1(gb)){ // adaptive_ref_pic_marking_mode_flag |
2967 | 3503 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
|
3504 MMCOOpcode opcode= get_ue_golomb(gb); |
1168 | 3505 |
3506 h->mmco[i].opcode= opcode; | |
3507 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
5784
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3508 h->mmco[i].short_pic_num= (h->curr_pic_num - get_ue_golomb(gb) - 1) & (h->max_pic_num - 1); |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5727
diff
changeset
|
3509 /* if(h->mmco[i].short_pic_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_pic_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
|
3510 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); |
1168 | 3511 return -1; |
3512 }*/ | |
3513 } | |
3514 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
5771
5290a3850c03
Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents:
5770
diff
changeset
|
3515 unsigned int long_arg= get_ue_golomb(gb); |
5784
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3516 if(long_arg >= 32 || (long_arg >= 16 && !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3517 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
1168 | 3518 return -1; |
3519 } | |
5771
5290a3850c03
Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
andoma
parents:
5770
diff
changeset
|
3520 h->mmco[i].long_arg= long_arg; |
1168 | 3521 } |
2967 | 3522 |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3523 if(opcode > (unsigned)MMCO_LONG){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3524 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
1168 | 3525 return -1; |
3526 } | |
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
|
3527 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
|
3528 break; |
1168 | 3529 } |
3530 h->mmco_index= i; | |
3531 }else{ | |
3532 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
3533 | |
5987 | 3534 if(h->short_ref_count && h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count && |
5784
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3535 !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) { |
1168 | 3536 h->mmco[0].opcode= MMCO_SHORT2UNUSED; |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5727
diff
changeset
|
3537 h->mmco[0].short_pic_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; |
1168 | 3538 h->mmco_index= 1; |
5784
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3539 if (FIELD_PICTURE) { |
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3540 h->mmco[0].short_pic_num *= 2; |
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3541 h->mmco[1].opcode= MMCO_SHORT2UNUSED; |
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3542 h->mmco[1].short_pic_num= h->mmco[0].short_pic_num + 1; |
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3543 h->mmco_index= 2; |
af2dab646def
Augment mmcodecoding process to work properly with fields. Part of PAFF implementation.
andoma
parents:
5783
diff
changeset
|
3544 } |
7387 | 3545 } |
1168 | 3546 } |
3547 } | |
2967 | 3548 |
3549 return 0; | |
1168 | 3550 } |
3551 | |
3552 static int init_poc(H264Context *h){ | |
3553 MpegEncContext * const s = &h->s; | |
3554 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
3555 int field_poc[2]; | |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
3556 Picture *cur = s->current_picture_ptr; |
1168 | 3557 |
7381 | 3558 h->frame_num_offset= h->prev_frame_num_offset; |
7380 | 3559 if(h->frame_num < h->prev_frame_num) |
7381 | 3560 h->frame_num_offset += max_frame_num; |
1168 | 3561 |
3562 if(h->sps.poc_type==0){ | |
3563 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
3564 | |
3565 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
3566 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
3567 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
3568 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
3569 else | |
3570 h->poc_msb = h->prev_poc_msb; | |
3571 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
2967 | 3572 field_poc[0] = |
1168 | 3573 field_poc[1] = h->poc_msb + h->poc_lsb; |
2967 | 3574 if(s->picture_structure == PICT_FRAME) |
1168 | 3575 field_poc[1] += h->delta_poc_bottom; |
3576 }else if(h->sps.poc_type==1){ | |
3577 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
3578 int i; | |
3579 | |
3580 if(h->sps.poc_cycle_length != 0) | |
3581 abs_frame_num = h->frame_num_offset + h->frame_num; | |
3582 else | |
3583 abs_frame_num = 0; | |
3584 | |
3585 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
3586 abs_frame_num--; | |
2967 | 3587 |
1168 | 3588 expected_delta_per_poc_cycle = 0; |
3589 for(i=0; i < h->sps.poc_cycle_length; i++) | |
3590 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
3591 | |
3592 if(abs_frame_num > 0){ | |
3593 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
3594 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
3595 | |
3596 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
3597 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
3598 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
3599 } else | |
3600 expectedpoc = 0; | |
3601 | |
2967 | 3602 if(h->nal_ref_idc == 0) |
1168 | 3603 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; |
2967 | 3604 |
1168 | 3605 field_poc[0] = expectedpoc + h->delta_poc[0]; |
3606 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
3607 | |
3608 if(s->picture_structure == PICT_FRAME) | |
3609 field_poc[1] += h->delta_poc[1]; | |
3610 }else{ | |
7381 | 3611 int poc= 2*(h->frame_num_offset + h->frame_num); |
3612 | |
3613 if(!h->nal_ref_idc) | |
3614 poc--; | |
7380 | 3615 |
1168 | 3616 field_poc[0]= poc; |
3617 field_poc[1]= poc; | |
3618 } | |
2967 | 3619 |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
3620 if(s->picture_structure != PICT_BOTTOM_FIELD) |
1168 | 3621 s->current_picture_ptr->field_poc[0]= field_poc[0]; |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
3622 if(s->picture_structure != PICT_TOP_FIELD) |
1168 | 3623 s->current_picture_ptr->field_poc[1]= field_poc[1]; |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
3624 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]); |
1168 | 3625 |
3626 return 0; | |
3627 } | |
3628 | |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3629 |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3630 /** |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3631 * initialize scan tables |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3632 */ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3633 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
|
3634 MpegEncContext * const s = &h->s; |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3635 int i; |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3636 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
|
3637 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
|
3638 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
|
3639 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3640 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
|
3641 #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
|
3642 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
|
3643 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
|
3644 #undef T |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3645 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3646 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3647 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
|
3648 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
|
3649 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
|
3650 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
|
3651 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
|
3652 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3653 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
|
3654 #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
|
3655 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
|
3656 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
|
3657 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
|
3658 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
|
3659 #undef T |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3660 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3661 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3662 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
|
3663 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
|
3664 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
|
3665 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
|
3666 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
|
3667 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
|
3668 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
|
3669 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3670 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
|
3671 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
|
3672 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
|
3673 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
|
3674 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
|
3675 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
|
3676 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3677 } |
5642 | 3678 |
3679 /** | |
3680 * Replicates H264 "master" context to thread contexts. | |
3681 */ | |
3682 static void clone_slice(H264Context *dst, H264Context *src) | |
3683 { | |
3684 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset)); | |
3685 dst->s.current_picture_ptr = src->s.current_picture_ptr; | |
3686 dst->s.current_picture = src->s.current_picture; | |
3687 dst->s.linesize = src->s.linesize; | |
3688 dst->s.uvlinesize = src->s.uvlinesize; | |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3689 dst->s.first_field = src->s.first_field; |
5642 | 3690 |
3691 dst->prev_poc_msb = src->prev_poc_msb; | |
3692 dst->prev_poc_lsb = src->prev_poc_lsb; | |
3693 dst->prev_frame_num_offset = src->prev_frame_num_offset; | |
3694 dst->prev_frame_num = src->prev_frame_num; | |
3695 dst->short_ref_count = src->short_ref_count; | |
3696 | |
3697 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref)); | |
3698 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref)); | |
3699 memcpy(dst->default_ref_list, src->default_ref_list, sizeof(dst->default_ref_list)); | |
3700 memcpy(dst->ref_list, src->ref_list, sizeof(dst->ref_list)); | |
5685
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
3701 |
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
3702 memcpy(dst->dequant4_coeff, src->dequant4_coeff, sizeof(src->dequant4_coeff)); |
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
3703 memcpy(dst->dequant8_coeff, src->dequant8_coeff, sizeof(src->dequant8_coeff)); |
5642 | 3704 } |
3705 | |
1168 | 3706 /** |
3707 * decodes a slice header. | |
6918 | 3708 * This will also call MPV_common_init() and frame_start() as needed. |
5642 | 3709 * |
3710 * @param h h264context | |
3711 * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding) | |
3712 * | |
6524 | 3713 * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded |
1168 | 3714 */ |
5642 | 3715 static int decode_slice_header(H264Context *h, H264Context *h0){ |
1168 | 3716 MpegEncContext * const s = &h->s; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3717 MpegEncContext * const s0 = &h0->s; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3718 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
|
3719 unsigned int pps_id; |
1168 | 3720 int num_ref_idx_active_override_flag; |
6481 | 3721 static const uint8_t slice_type_map[5]= {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE}; |
7332 | 3722 unsigned int slice_type, tmp, i, j; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3723 int default_ref_list_done = 0; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3724 int last_pic_structure; |
1168 | 3725 |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3726 s->dropable= h->nal_ref_idc == 0; |
1168 | 3727 |
5984
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3728 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !h->nal_ref_idc){ |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3729 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3730 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3731 }else{ |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3732 s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab; |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3733 s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab; |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3734 } |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
3735 |
1168 | 3736 first_mb_in_slice= get_ue_golomb(&s->gb); |
3737 | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3738 if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){ |
5642 | 3739 h0->current_slice = 0; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3740 if (!s0->first_field) |
5803 | 3741 s->current_picture_ptr= NULL; |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3742 } |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3743 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3744 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
|
3745 if(slice_type > 9){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3746 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 | 3747 return -1; |
1168 | 3748 } |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3749 if(slice_type > 4){ |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3750 slice_type -= 5; |
1168 | 3751 h->slice_type_fixed=1; |
3752 }else | |
3753 h->slice_type_fixed=0; | |
2967 | 3754 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3755 slice_type= slice_type_map[ slice_type ]; |
6481 | 3756 if (slice_type == FF_I_TYPE |
5642 | 3757 || (h0->current_slice != 0 && slice_type == h0->last_slice_type) ) { |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3758 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
|
3759 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3760 h->slice_type= slice_type; |
7338 | 3761 h->slice_type_nos= slice_type & 3; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3762 |
7374 | 3763 s->pict_type= h->slice_type; // to make a few old functions happy, it's wrong though |
6481 | 3764 if (s->pict_type == FF_B_TYPE && s0->last_picture_ptr == NULL) { |
6016
5455f4e43948
Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents:
6014
diff
changeset
|
3765 av_log(h->s.avctx, AV_LOG_ERROR, |
5455f4e43948
Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents:
6014
diff
changeset
|
3766 "B picture before any references, skipping\n"); |
5455f4e43948
Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents:
6014
diff
changeset
|
3767 return -1; |
5455f4e43948
Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start.
heydowns
parents:
6014
diff
changeset
|
3768 } |
2967 | 3769 |
1168 | 3770 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
|
3771 if(pps_id>=MAX_PPS_COUNT){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3772 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 3773 return -1; |
3774 } | |
5642 | 3775 if(!h0->pps_buffers[pps_id]) { |
7374 | 3776 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n"); |
1174 | 3777 return -1; |
3778 } | |
5642 | 3779 h->pps= *h0->pps_buffers[pps_id]; |
3780 | |
3781 if(!h0->sps_buffers[h->pps.sps_id]) { | |
7374 | 3782 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n"); |
1174 | 3783 return -1; |
3784 } | |
5642 | 3785 h->sps = *h0->sps_buffers[h->pps.sps_id]; |
2919 | 3786 |
5685
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
3787 if(h == h0 && h->dequant_coeff_pps != pps_id){ |
4363 | 3788 h->dequant_coeff_pps = pps_id; |
2919 | 3789 init_dequant_tables(h); |
3790 } | |
2967 | 3791 |
1168 | 3792 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
|
3793 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
2967 | 3794 |
3178 | 3795 h->b_stride= s->mb_width*4; |
3796 h->b8_stride= s->mb_width*2; | |
1168 | 3797 |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
3798 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7); |
1168 | 3799 if(h->sps.frame_mbs_only_flag) |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
3800 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7); |
1168 | 3801 else |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
3802 s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3); |
2967 | 3803 |
3804 if (s->context_initialized | |
1548 | 3805 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
5642 | 3806 if(h != h0) |
3807 return -1; // width / height changed during parallelized decoding | |
1168 | 3808 free_tables(h); |
3809 MPV_common_end(s); | |
3810 } | |
3811 if (!s->context_initialized) { | |
5642 | 3812 if(h != h0) |
3813 return -1; // we cant (re-)initialize context during parallel decoding | |
1168 | 3814 if (MPV_common_init(s) < 0) |
3815 return -1; | |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3816 s->first_field = 0; |
2967 | 3817 |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas ªÓman %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
3818 init_scan_tables(h); |
1168 | 3819 alloc_tables(h); |
3820 | |
5642 | 3821 for(i = 1; i < s->avctx->thread_count; i++) { |
3822 H264Context *c; | |
3823 c = h->thread_context[i] = av_malloc(sizeof(H264Context)); | |
6193
52ccab2531bd
Fix memory leak in h264 decoder. allocated_edge_emu_buffer was being allocated
heydowns
parents:
6190
diff
changeset
|
3824 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext)); |
5642 | 3825 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext)); |
3826 c->sps = h->sps; | |
3827 c->pps = h->pps; | |
3828 init_scan_tables(c); | |
3829 clone_tables(c, h); | |
3830 } | |
3831 | |
3832 for(i = 0; i < s->avctx->thread_count; i++) | |
3833 if(context_init(h->thread_context[i]) < 0) | |
3834 return -1; | |
3835 | |
1168 | 3836 s->avctx->width = s->width; |
3837 s->avctx->height = s->height; | |
1548 | 3838 s->avctx->sample_aspect_ratio= h->sps.sar; |
2440 | 3839 if(!s->avctx->sample_aspect_ratio.den) |
3840 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
|
3841 |
2648 | 3842 if(h->sps.timing_info_present_flag){ |
3052 | 3843 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
|
3844 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
|
3845 s->avctx->time_base.den *= 2; |
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
3846 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
|
3847 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
|
3848 } |
1168 | 3849 } |
3850 | |
3851 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); | |
3852 | |
3316 | 3853 h->mb_mbaff = 0; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3854 h->mb_aff_frame = 0; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3855 last_pic_structure = s0->picture_structure; |
1168 | 3856 if(h->sps.frame_mbs_only_flag){ |
3857 s->picture_structure= PICT_FRAME; | |
3858 }else{ | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3859 if(get_bits1(&s->gb)) { //field_pic_flag |
1168 | 3860 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3861 } else { |
1168 | 3862 s->picture_structure= PICT_FRAME; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3863 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
|
3864 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3865 } |
7468 | 3866 h->mb_field_decoding_flag= s->picture_structure != PICT_FRAME; |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3867 |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3868 if(h0->current_slice == 0){ |
7350 | 3869 while(h->frame_num != h->prev_frame_num && |
3870 h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){ | |
3871 av_log(NULL, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); | |
3872 frame_start(h); | |
3873 h->prev_frame_num++; | |
3874 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num; | |
3875 s->current_picture_ptr->frame_num= h->prev_frame_num; | |
3876 execute_ref_pic_marking(h, NULL, 0); | |
3877 } | |
3878 | |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3879 /* See if we have a decoded first field looking for a pair... */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3880 if (s0->first_field) { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3881 assert(s0->current_picture_ptr); |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3882 assert(s0->current_picture_ptr->data[0]); |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3883 assert(s0->current_picture_ptr->reference != DELAYED_PIC_REF); |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3884 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3885 /* figure out if we have a complementary field pair */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3886 if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3887 /* |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3888 * Previous field is unmatched. Don't display it, but let it |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3889 * remain for reference if marked as such. |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3890 */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3891 s0->current_picture_ptr = NULL; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3892 s0->first_field = FIELD_PICTURE; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3893 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3894 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3895 if (h->nal_ref_idc && |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3896 s0->current_picture_ptr->reference && |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3897 s0->current_picture_ptr->frame_num != h->frame_num) { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3898 /* |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3899 * This and previous field were reference, but had |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3900 * different frame_nums. Consider this field first in |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3901 * pair. Throw away previous field except for reference |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3902 * purposes. |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3903 */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3904 s0->first_field = 1; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3905 s0->current_picture_ptr = NULL; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3906 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3907 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3908 /* Second field in complementary pair */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3909 s0->first_field = 0; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3910 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3911 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3912 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3913 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3914 /* Frame or first field in a potentially complementary pair */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3915 assert(!s0->current_picture_ptr); |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3916 s0->first_field = FIELD_PICTURE; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3917 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3918 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3919 if((!FIELD_PICTURE || s0->first_field) && frame_start(h) < 0) { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3920 s0->first_field = 0; |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3921 return -1; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3922 } |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3923 } |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3924 if(h != h0) |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3925 clone_slice(h, h0); |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3926 |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3927 s->current_picture_ptr->frame_num= h->frame_num; //FIXME frame_num cleanup |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
3928 |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3929 assert(s->mb_num == s->mb_width * s->mb_height); |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
3930 if(first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= s->mb_num || |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3931 first_mb_in_slice >= s->mb_num){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3932 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
|
3933 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3934 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3935 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
3936 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << FIELD_OR_MBAFF_PICTURE; |
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
3937 if (s->picture_structure == PICT_BOTTOM_FIELD) |
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
3938 s->resync_mb_y = s->mb_y = s->mb_y + 1; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
3939 assert(s->mb_y < s->mb_height); |
2967 | 3940 |
1168 | 3941 if(s->picture_structure==PICT_FRAME){ |
3942 h->curr_pic_num= h->frame_num; | |
3943 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
3944 }else{ | |
5772
65b71bd21a4d
Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents:
5771
diff
changeset
|
3945 h->curr_pic_num= 2*h->frame_num + 1; |
1168 | 3946 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); |
3947 } | |
2967 | 3948 |
1168 | 3949 if(h->nal_unit_type == NAL_IDR_SLICE){ |
1453 | 3950 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 3951 } |
2967 | 3952 |
1168 | 3953 if(h->sps.poc_type==0){ |
3954 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
2967 | 3955 |
1168 | 3956 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ |
3957 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
3958 } | |
3959 } | |
2967 | 3960 |
1168 | 3961 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ |
3962 h->delta_poc[0]= get_se_golomb(&s->gb); | |
2967 | 3963 |
1168 | 3964 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) |
3965 h->delta_poc[1]= get_se_golomb(&s->gb); | |
3966 } | |
2967 | 3967 |
1168 | 3968 init_poc(h); |
2967 | 3969 |
1168 | 3970 if(h->pps.redundant_pic_cnt_present){ |
3971 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
3972 } | |
3973 | |
7374 | 3974 //set defaults, might be overridden a few lines later |
1168 | 3975 h->ref_count[0]= h->pps.ref_count[0]; |
3976 h->ref_count[1]= h->pps.ref_count[1]; | |
3977 | |
7338 | 3978 if(h->slice_type_nos != FF_I_TYPE){ |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
3979 if(h->slice_type_nos == FF_B_TYPE){ |
1168 | 3980 h->direct_spatial_mv_pred= get_bits1(&s->gb); |
3981 } | |
3982 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
2967 | 3983 |
1168 | 3984 if(num_ref_idx_active_override_flag){ |
3985 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
3986 if(h->slice_type_nos==FF_B_TYPE) |
1168 | 3987 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; |
3988 | |
4532 | 3989 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
|
3990 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
|
3991 h->ref_count[0]= h->ref_count[1]= 1; |
1168 | 3992 return -1; |
3993 } | |
3994 } | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
3995 if(h->slice_type_nos == FF_B_TYPE) |
4532 | 3996 h->list_count= 2; |
3997 else | |
3998 h->list_count= 1; | |
3999 }else | |
4000 h->list_count= 0; | |
1168 | 4001 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4002 if(!default_ref_list_done){ |
1168 | 4003 fill_default_ref_list(h); |
4004 } | |
4005 | |
7417
5b281979b60e
Simple refactoring to resolve a FIXME. Patch by Paul Kendall.
darkshikari
parents:
7408
diff
changeset
|
4006 if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0) |
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4007 return -1; |
1168 | 4008 |
7339 | 4009 if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4010 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) ) |
1168 | 4011 pred_weight_table(h); |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4012 else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE) |
2415 | 4013 implicit_weight_table(h); |
4014 else | |
4015 h->use_weight = 0; | |
2967 | 4016 |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
4017 if(h->nal_ref_idc) |
5642 | 4018 decode_ref_pic_marking(h0, &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
|
4019 |
3316 | 4020 if(FRAME_MBAFF) |
4021 fill_mbaff_ref_list(h); | |
4022 | |
7338 | 4023 if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){ |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4024 tmp = get_ue_golomb(&s->gb); |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4025 if(tmp > 2){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4026 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
|
4027 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4028 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4029 h->cabac_init_idc= tmp; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4030 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4031 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4032 h->last_qscale_diff = 0; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4033 tmp = h->pps.init_qp + get_se_golomb(&s->gb); |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4034 if(tmp>51){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4035 av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); |
1898 | 4036 return -1; |
4037 } | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4038 s->qscale= tmp; |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4039 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
|
4040 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale); |
1168 | 4041 //FIXME qscale / qp ... stuff |
6481 | 4042 if(h->slice_type == FF_SP_TYPE){ |
1453 | 4043 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 4044 } |
6481 | 4045 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){ |
1453 | 4046 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 4047 } |
4048 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4049 h->deblocking_filter = 1; |
1898 | 4050 h->slice_alpha_c0_offset = 0; |
4051 h->slice_beta_offset = 0; | |
1168 | 4052 if( h->pps.deblocking_filter_parameters_present ) { |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4053 tmp= get_ue_golomb(&s->gb); |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4054 if(tmp > 2){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4055 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
|
4056 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4057 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4058 h->deblocking_filter= tmp; |
2967 | 4059 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
|
4060 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
|
4061 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4062 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
|
4063 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
|
4064 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
1168 | 4065 } |
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
|
4066 } |
5642 | 4067 |
5698
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
4068 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
7340 | 4069 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type_nos != FF_I_TYPE) |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4070 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type_nos == FF_B_TYPE) |
5698
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
4071 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
4072 h->deblocking_filter= 0; |
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
4073 |
5642 | 4074 if(h->deblocking_filter == 1 && h0->max_contexts > 1) { |
5646 | 4075 if(s->avctx->flags2 & CODEC_FLAG2_FAST) { |
4076 /* Cheat slightly for speed: | |
6029 | 4077 Do not bother to deblock across slices. */ |
5646 | 4078 h->deblocking_filter = 2; |
4079 } else { | |
5647 | 4080 h0->max_contexts = 1; |
4081 if(!h0->single_decode_warning) { | |
4082 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); | |
4083 h0->single_decode_warning = 1; | |
4084 } | |
4085 if(h != h0) | |
4086 return 1; // deblocking switched inside frame | |
5646 | 4087 } |
5642 | 4088 } |
4089 | |
1168 | 4090 #if 0 //FMO |
4091 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
4092 slice_group_change_cycle= get_bits(&s->gb, ?); | |
4093 #endif | |
4094 | |
5642 | 4095 h0->last_slice_type = slice_type; |
4096 h->slice_num = ++h0->current_slice; | |
2392 | 4097 |
7343 | 4098 for(j=0; j<2; j++){ |
4099 int *ref2frm= h->ref2frm[h->slice_num&15][j]; | |
4100 ref2frm[0]= | |
4101 ref2frm[1]= -1; | |
4102 for(i=0; i<48; i++) | |
4103 ref2frm[i+2]= 4*h->ref_list[j][i].frame_num | |
4104 +(h->ref_list[j][i].reference&3); | |
4105 } | |
4106 | |
3316 | 4107 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; |
5783
4b5dc5ad7410
Edge emulation for fields. Part of PAFF implementation
andoma
parents:
5782
diff
changeset
|
4108 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; |
3316 | 4109 |
1168 | 4110 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
6890 | 4111 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 %s\n", |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4112 h->slice_num, |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4113 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
2967 | 4114 first_mb_in_slice, |
1264 | 4115 av_get_pict_type_char(h->slice_type), |
1168 | 4116 pps_id, h->frame_num, |
4117 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
4118 h->ref_count[0], h->ref_count[1], | |
4119 s->qscale, | |
2583 | 4120 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
2415 | 4121 h->use_weight, |
6890 | 4122 h->use_weight==1 && h->use_weight_chroma ? "c" : "", |
4123 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : "" | |
1168 | 4124 ); |
4125 } | |
4126 | |
4127 return 0; | |
4128 } | |
4129 | |
4130 /** | |
4131 * | |
4132 */ | |
4133 static inline int get_level_prefix(GetBitContext *gb){ | |
4134 unsigned int buf; | |
4135 int log; | |
2967 | 4136 |
1168 | 4137 OPEN_READER(re, gb); |
4138 UPDATE_CACHE(re, gb); | |
4139 buf=GET_CACHE(re, gb); | |
2967 | 4140 |
1168 | 4141 log= 32 - av_log2(buf); |
4142 #ifdef TRACE | |
4143 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
|
4144 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 | 4145 #endif |
4146 | |
4147 LAST_SKIP_BITS(re, gb, log); | |
4148 CLOSE_READER(re, gb); | |
4149 | |
4150 return log-1; | |
4151 } | |
4152 | |
2755 | 4153 static inline int get_dct8x8_allowed(H264Context *h){ |
4154 int i; | |
4155 for(i=0; i<4; i++){ | |
4156 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
|
4157 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))) |
2755 | 4158 return 0; |
4159 } | |
4160 return 1; | |
4161 } | |
4162 | |
1168 | 4163 /** |
4164 * decodes a residual block. | |
4165 * @param n block index | |
4166 * @param scantable scantable | |
4167 * @param max_coeff number of coefficients in the block | |
6524 | 4168 * @return <0 if an error occurred |
1168 | 4169 */ |
2919 | 4170 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ |
1168 | 4171 MpegEncContext * const s = &h->s; |
4172 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 | 4173 int level[16]; |
4174 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before; | |
1168 | 4175 |
4176 //FIXME put trailing_onex into the context | |
4177 | |
4178 if(n == CHROMA_DC_BLOCK_INDEX){ | |
4179 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
4180 total_coeff= coeff_token>>2; | |
2967 | 4181 }else{ |
1168 | 4182 if(n == LUMA_DC_BLOCK_INDEX){ |
4183 total_coeff= pred_non_zero_count(h, 0); | |
4184 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
4185 total_coeff= coeff_token>>2; | |
4186 }else{ | |
4187 total_coeff= pred_non_zero_count(h, n); | |
4188 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
4189 total_coeff= coeff_token>>2; | |
4190 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
4191 } | |
4192 } | |
4193 | |
4194 //FIXME set last_non_zero? | |
4195 | |
4196 if(total_coeff==0) | |
4197 return 0; | |
4391
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4198 if(total_coeff > (unsigned)max_coeff) { |
20944c70a3c0
fix segfault with darkkben.free.fr/corrupted_h264.mp4
michael
parents:
4390
diff
changeset
|
4199 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 | 4200 return -1; |
4201 } | |
2967 | 4202 |
1168 | 4203 trailing_ones= coeff_token&3; |
4600 | 4204 tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); |
1168 | 4205 assert(total_coeff<=16); |
2967 | 4206 |
1168 | 4207 for(i=0; i<trailing_ones; i++){ |
4208 level[i]= 1 - 2*get_bits1(gb); | |
4209 } | |
4210 | |
2897 | 4211 if(i<total_coeff) { |
1168 | 4212 int level_code, mask; |
2897 | 4213 int suffix_length = total_coeff > 10 && trailing_ones < 3; |
4214 int prefix= get_level_prefix(gb); | |
4215 | |
4216 //first coefficient has suffix_length equal to 0 or 1 | |
1168 | 4217 if(prefix<14){ //FIXME try to build a large unified VLC table for all this |
4218 if(suffix_length) | |
4219 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
4220 else | |
4221 level_code= (prefix<<suffix_length); //part | |
4222 }else if(prefix==14){ | |
4223 if(suffix_length) | |
4224 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
4225 else | |
4226 level_code= prefix + get_bits(gb, 4); //part | |
7225 | 4227 }else{ |
4228 level_code= (15<<suffix_length) + get_bits(gb, prefix-3); //part | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4229 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
7225 | 4230 if(prefix>=16) |
4231 level_code += (1<<(prefix-3))-4096; | |
1168 | 4232 } |
4233 | |
2897 | 4234 if(trailing_ones < 3) level_code += 2; |
4235 | |
4236 suffix_length = 1; | |
4237 if(level_code > 5) | |
4238 suffix_length++; | |
1168 | 4239 mask= -(level_code&1); |
4240 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
2897 | 4241 i++; |
4242 | |
4243 //remaining coefficients have suffix_length > 0 | |
4244 for(;i<total_coeff;i++) { | |
4245 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX }; | |
4246 prefix = get_level_prefix(gb); | |
4247 if(prefix<15){ | |
4248 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length); | |
4249 }else{ | |
7225 | 4250 level_code = (15<<suffix_length) + get_bits(gb, prefix-3); |
4251 if(prefix>=16) | |
4252 level_code += (1<<(prefix-3))-4096; | |
2897 | 4253 } |
4254 mask= -(level_code&1); | |
4255 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
4256 if(level_code > suffix_limit[suffix_length]) | |
4257 suffix_length++; | |
4258 } | |
1168 | 4259 } |
4260 | |
4261 if(total_coeff == max_coeff) | |
4262 zeros_left=0; | |
4263 else{ | |
4264 if(n == CHROMA_DC_BLOCK_INDEX) | |
4265 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
4266 else | |
4267 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
4268 } | |
2897 | 4269 |
4270 coeff_num = zeros_left + total_coeff - 1; | |
4271 j = scantable[coeff_num]; | |
4272 if(n > 24){ | |
4273 block[j] = level[0]; | |
4274 for(i=1;i<total_coeff;i++) { | |
4275 if(zeros_left <= 0) | |
4276 run_before = 0; | |
4277 else if(zeros_left < 7){ | |
4278 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
4279 }else{ | |
4280 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
4281 } | |
4282 zeros_left -= run_before; | |
4283 coeff_num -= 1 + run_before; | |
4284 j= scantable[ coeff_num ]; | |
4285 | |
4286 block[j]= level[i]; | |
4287 } | |
4288 }else{ | |
2919 | 4289 block[j] = (level[0] * qmul[j] + 32)>>6; |
2897 | 4290 for(i=1;i<total_coeff;i++) { |
4291 if(zeros_left <= 0) | |
4292 run_before = 0; | |
4293 else if(zeros_left < 7){ | |
4294 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
4295 }else{ | |
4296 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
4297 } | |
4298 zeros_left -= run_before; | |
4299 coeff_num -= 1 + run_before; | |
4300 j= scantable[ coeff_num ]; | |
4301 | |
2919 | 4302 block[j]= (level[i] * qmul[j] + 32)>>6; |
2897 | 4303 } |
1168 | 4304 } |
4305 | |
4306 if(zeros_left<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4307 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
1168 | 4308 return -1; |
4309 } | |
2897 | 4310 |
1168 | 4311 return 0; |
4312 } | |
4313 | |
3316 | 4314 static void predict_field_decoding_flag(H264Context *h){ |
4315 MpegEncContext * const s = &h->s; | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4316 const int mb_xy= h->mb_xy; |
3316 | 4317 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) |
4318 ? s->current_picture.mb_type[mb_xy-1] | |
4319 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) | |
4320 ? s->current_picture.mb_type[mb_xy-s->mb_stride] | |
4321 : 0; | |
4322 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; | |
4323 } | |
4324 | |
1168 | 4325 /** |
2396 | 4326 * decodes a P_SKIP or B_SKIP macroblock |
4327 */ | |
4328 static void decode_mb_skip(H264Context *h){ | |
4329 MpegEncContext * const s = &h->s; | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4330 const int mb_xy= h->mb_xy; |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4331 int mb_type=0; |
2967 | 4332 |
2396 | 4333 memset(h->non_zero_count[mb_xy], 0, 16); |
4334 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
4335 | |
3316 | 4336 if(MB_FIELD) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4337 mb_type|= MB_TYPE_INTERLACED; |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4338 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4339 if( h->slice_type_nos == FF_B_TYPE ) |
2396 | 4340 { |
4341 // 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
|
4342 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
2396 | 4343 |
2449 | 4344 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 4345 pred_direct_motion(h, &mb_type); |
3927 | 4346 mb_type|= MB_TYPE_SKIP; |
2396 | 4347 } |
4348 else | |
4349 { | |
4350 int mx, my; | |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4351 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
2396 | 4352 |
2449 | 4353 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 4354 pred_pskip_motion(h, &mx, &my); |
4355 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
4356 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
4357 } | |
4358 | |
4359 write_back_motion(h, mb_type); | |
3927 | 4360 s->current_picture.mb_type[mb_xy]= mb_type; |
2396 | 4361 s->current_picture.qscale_table[mb_xy]= s->qscale; |
4362 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
|
4363 h->prev_mb_skipped= 1; |
2396 | 4364 } |
4365 | |
4366 /** | |
1168 | 4367 * decodes a macroblock |
7374 | 4368 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
1168 | 4369 */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4370 static int decode_mb_cavlc(H264Context *h){ |
1168 | 4371 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4372 int mb_xy; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4373 int partition_count; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4374 unsigned int mb_type, cbp; |
2755 | 4375 int dct8x8_allowed= h->pps.transform_8x8_mode; |
1168 | 4376 |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4377 mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4378 |
2967 | 4379 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
1168 | 4380 |
4600 | 4381 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1453 | 4382 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
4383 down the code */ | |
7338 | 4384 if(h->slice_type_nos != FF_I_TYPE){ |
1168 | 4385 if(s->mb_skip_run==-1) |
4386 s->mb_skip_run= get_ue_golomb(&s->gb); | |
2967 | 4387 |
1168 | 4388 if (s->mb_skip_run--) { |
3316 | 4389 if(FRAME_MBAFF && (s->mb_y&1) == 0){ |
4390 if(s->mb_skip_run==0) | |
4391 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
4392 else | |
4393 predict_field_decoding_flag(h); | |
4394 } | |
2396 | 4395 decode_mb_skip(h); |
1168 | 4396 return 0; |
4397 } | |
4398 } | |
3316 | 4399 if(FRAME_MBAFF){ |
4400 if( (s->mb_y&1) == 0 ) | |
4401 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
7469
856df346b536
Remove useless mb_field_decoding_flag setting code that was at the wrong spot.
michael
parents:
7468
diff
changeset
|
4402 } |
2967 | 4403 |
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
|
4404 h->prev_mb_skipped= 0; |
2967 | 4405 |
1168 | 4406 mb_type= get_ue_golomb(&s->gb); |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4407 if(h->slice_type_nos == FF_B_TYPE){ |
1168 | 4408 if(mb_type < 23){ |
4409 partition_count= b_mb_type_info[mb_type].partition_count; | |
4410 mb_type= b_mb_type_info[mb_type].type; | |
4411 }else{ | |
4412 mb_type -= 23; | |
4413 goto decode_intra_mb; | |
4414 } | |
7340 | 4415 }else if(h->slice_type_nos == FF_P_TYPE){ |
1168 | 4416 if(mb_type < 5){ |
4417 partition_count= p_mb_type_info[mb_type].partition_count; | |
4418 mb_type= p_mb_type_info[mb_type].type; | |
4419 }else{ | |
4420 mb_type -= 5; | |
4421 goto decode_intra_mb; | |
4422 } | |
4423 }else{ | |
7340 | 4424 assert(h->slice_type_nos == FF_I_TYPE); |
4425 if(h->slice_type == FF_SI_TYPE && mb_type) | |
4426 mb_type--; | |
1168 | 4427 decode_intra_mb: |
4428 if(mb_type > 25){ | |
3954 | 4429 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 | 4430 return -1; |
4431 } | |
4432 partition_count=0; | |
4433 cbp= i_mb_type_info[mb_type].cbp; | |
4434 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
4435 mb_type= i_mb_type_info[mb_type].type; | |
4436 } | |
4437 | |
3316 | 4438 if(MB_FIELD) |
1168 | 4439 mb_type |= MB_TYPE_INTERLACED; |
4440 | |
4441 h->slice_table[ mb_xy ]= h->slice_num; | |
2967 | 4442 |
1168 | 4443 if(IS_INTRA_PCM(mb_type)){ |
7450 | 4444 unsigned int x; |
2967 | 4445 |
5127 | 4446 // We assume these blocks are very rare so we do not optimize it. |
1168 | 4447 align_get_bits(&s->gb); |
2967 | 4448 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4449 // The pixels are stored in the same order as levels in h->mb array. |
7450 | 4450 for(x=0; x < (CHROMA ? 384 : 256); x++){ |
4451 ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8); | |
7407 | 4452 } |
2967 | 4453 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4454 // In deblocking, the quantizer is 0 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4455 s->current_picture.qscale_table[mb_xy]= 0; |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4456 // 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
|
4457 memset(h->non_zero_count[mb_xy], 16, 16); |
2967 | 4458 |
2755 | 4459 s->current_picture.mb_type[mb_xy]= mb_type; |
1168 | 4460 return 0; |
4461 } | |
2967 | 4462 |
3316 | 4463 if(MB_MBAFF){ |
4464 h->ref_count[0] <<= 1; | |
4465 h->ref_count[1] <<= 1; | |
4466 } | |
4467 | |
2449 | 4468 fill_caches(h, mb_type, 0); |
1168 | 4469 |
4470 //mb_pred | |
4471 if(IS_INTRA(mb_type)){ | |
7408 | 4472 int pred_mode; |
1168 | 4473 // init_top_left_availability(h); |
7408 | 4474 if(IS_INTRA4x4(mb_type)){ |
4475 int i; | |
4476 int di = 1; | |
4477 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
4478 mb_type |= MB_TYPE_8x8DCT; | |
4479 di = 4; | |
4480 } | |
1168 | 4481 |
4482 // fill_intra4x4_pred_table(h); | |
7408 | 4483 for(i=0; i<16; i+=di){ |
4484 int mode= pred_intra_mode(h, i); | |
4485 | |
4486 if(!get_bits1(&s->gb)){ | |
4487 const int rem_mode= get_bits(&s->gb, 3); | |
4488 mode = rem_mode + (rem_mode >= mode); | |
1168 | 4489 } |
7408 | 4490 |
4491 if(di==4) | |
4492 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
4493 else | |
4494 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
4495 } | |
4496 write_back_intra_pred_mode(h); | |
4497 if( check_intra4x4_pred_mode(h) < 0) | |
4498 return -1; | |
4499 }else{ | |
4500 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
4501 if(h->intra16x16_pred_mode < 0) | |
4502 return -1; | |
4503 } | |
4504 if(CHROMA){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4505 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
|
4506 if(pred_mode < 0) |
1168 | 4507 return -1; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4508 h->chroma_pred_mode= pred_mode; |
7408 | 4509 } |
1168 | 4510 }else if(partition_count==4){ |
4511 int i, j, sub_partition_count[4], list, ref[2][4]; | |
2967 | 4512 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4513 if(h->slice_type_nos == FF_B_TYPE){ |
1168 | 4514 for(i=0; i<4; i++){ |
4515 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
4516 if(h->sub_mb_type[i] >=13){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4517 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 | 4518 return -1; |
4519 } | |
4520 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
4521 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
4522 } | |
2396 | 4523 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
3003 | 4524 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { |
2396 | 4525 pred_direct_motion(h, &mb_type); |
3003 | 4526 h->ref_cache[0][scan8[4]] = |
4527 h->ref_cache[1][scan8[4]] = | |
4528 h->ref_cache[0][scan8[12]] = | |
4529 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | |
4530 } | |
1168 | 4531 }else{ |
7338 | 4532 assert(h->slice_type_nos == FF_P_TYPE); //FIXME SP correct ? |
1168 | 4533 for(i=0; i<4; i++){ |
4534 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
4535 if(h->sub_mb_type[i] >=4){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4536 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 | 4537 return -1; |
4538 } | |
4539 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
4540 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
4541 } | |
4542 } | |
2967 | 4543 |
4533 | 4544 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
|
4545 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
1168 | 4546 for(i=0; i<4; i++){ |
2396 | 4547 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
4548 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4549 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
|
4550 if(tmp>=ref_count){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4551 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
|
4552 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4553 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4554 ref[list][i]= tmp; |
1168 | 4555 }else{ |
4556 //FIXME | |
4557 ref[list][i] = -1; | |
4558 } | |
4559 } | |
4560 } | |
2967 | 4561 |
2755 | 4562 if(dct8x8_allowed) |
4563 dct8x8_allowed = get_dct8x8_allowed(h); | |
2967 | 4564 |
4533 | 4565 for(list=0; list<h->list_count; list++){ |
1168 | 4566 for(i=0; i<4; i++){ |
3003 | 4567 if(IS_DIRECT(h->sub_mb_type[i])) { |
4568 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ]; | |
4569 continue; | |
4570 } | |
1168 | 4571 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
4572 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
4573 | |
2396 | 4574 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
1168 | 4575 const int sub_mb_type= h->sub_mb_type[i]; |
4576 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
4577 for(j=0; j<sub_partition_count[i]; j++){ | |
4578 int mx, my; | |
4579 const int index= 4*i + block_width*j; | |
4580 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
4581 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
4582 mx += get_se_golomb(&s->gb); | |
4583 my += get_se_golomb(&s->gb); | |
4600 | 4584 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
1170 | 4585 |
1168 | 4586 if(IS_SUB_8X8(sub_mb_type)){ |
4530 | 4587 mv_cache[ 1 ][0]= |
1168 | 4588 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
4530 | 4589 mv_cache[ 1 ][1]= |
1168 | 4590 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
4591 }else if(IS_SUB_8X4(sub_mb_type)){ | |
4530 | 4592 mv_cache[ 1 ][0]= mx; |
4593 mv_cache[ 1 ][1]= my; | |
1168 | 4594 }else if(IS_SUB_4X8(sub_mb_type)){ |
4530 | 4595 mv_cache[ 8 ][0]= mx; |
4596 mv_cache[ 8 ][1]= my; | |
1168 | 4597 } |
4530 | 4598 mv_cache[ 0 ][0]= mx; |
4599 mv_cache[ 0 ][1]= my; | |
1168 | 4600 } |
4601 }else{ | |
4602 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
4603 p[0] = p[1]= | |
4604 p[8] = p[9]= 0; | |
4605 } | |
4606 } | |
4607 } | |
2396 | 4608 }else if(IS_DIRECT(mb_type)){ |
4609 pred_direct_motion(h, &mb_type); | |
2755 | 4610 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
2396 | 4611 }else{ |
1168 | 4612 int list, mx, my, i; |
4613 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
4614 if(IS_16X16(mb_type)){ | |
4534 | 4615 for(list=0; list<h->list_count; list++){ |
4616 unsigned int val; | |
1168 | 4617 if(IS_DIR(mb_type, 0, list)){ |
4534 | 4618 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4619 if(val >= h->ref_count[list]){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4620 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
|
4621 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4622 } |
2523 | 4623 }else |
4534 | 4624 val= LIST_NOT_USED&0xFF; |
4625 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
4626 } | |
4627 for(list=0; list<h->list_count; list++){ | |
4628 unsigned int val; | |
1168 | 4629 if(IS_DIR(mb_type, 0, list)){ |
4630 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
4631 mx += get_se_golomb(&s->gb); | |
4632 my += get_se_golomb(&s->gb); | |
4600 | 4633 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
1170 | 4634 |
4534 | 4635 val= pack16to32(mx,my); |
2523 | 4636 }else |
4534 | 4637 val=0; |
4638 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4); | |
1168 | 4639 } |
4640 } | |
4641 else if(IS_16X8(mb_type)){ | |
4534 | 4642 for(list=0; list<h->list_count; list++){ |
1168 | 4643 for(i=0; i<2; i++){ |
4534 | 4644 unsigned int val; |
1168 | 4645 if(IS_DIR(mb_type, i, list)){ |
4534 | 4646 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4647 if(val >= h->ref_count[list]){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4648 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
|
4649 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4650 } |
2523 | 4651 }else |
4534 | 4652 val= LIST_NOT_USED&0xFF; |
4653 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
1168 | 4654 } |
4534 | 4655 } |
4656 for(list=0; list<h->list_count; list++){ | |
1168 | 4657 for(i=0; i<2; i++){ |
4534 | 4658 unsigned int val; |
1168 | 4659 if(IS_DIR(mb_type, i, list)){ |
4660 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
4661 mx += get_se_golomb(&s->gb); | |
4662 my += get_se_golomb(&s->gb); | |
4600 | 4663 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
1170 | 4664 |
4534 | 4665 val= pack16to32(mx,my); |
2396 | 4666 }else |
4534 | 4667 val=0; |
4668 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 4); | |
1168 | 4669 } |
4670 } | |
4671 }else{ | |
4672 assert(IS_8X16(mb_type)); | |
4534 | 4673 for(list=0; list<h->list_count; list++){ |
1168 | 4674 for(i=0; i<2; i++){ |
4534 | 4675 unsigned int val; |
1168 | 4676 if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
4534 | 4677 val= get_te0_golomb(&s->gb, h->ref_count[list]); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4678 if(val >= h->ref_count[list]){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4679 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
|
4680 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4681 } |
2523 | 4682 }else |
4534 | 4683 val= LIST_NOT_USED&0xFF; |
4684 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
1168 | 4685 } |
4534 | 4686 } |
4687 for(list=0; list<h->list_count; list++){ | |
1168 | 4688 for(i=0; i<2; i++){ |
4534 | 4689 unsigned int val; |
1168 | 4690 if(IS_DIR(mb_type, i, list)){ |
4691 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
4692 mx += get_se_golomb(&s->gb); | |
4693 my += get_se_golomb(&s->gb); | |
4600 | 4694 tprintf(s->avctx, "final mv:%d %d\n", mx, my); |
1170 | 4695 |
4534 | 4696 val= pack16to32(mx,my); |
2396 | 4697 }else |
4534 | 4698 val=0; |
4699 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 4); | |
1168 | 4700 } |
4701 } | |
4702 } | |
4703 } | |
2967 | 4704 |
1168 | 4705 if(IS_INTER(mb_type)) |
4706 write_back_motion(h, mb_type); | |
2967 | 4707 |
1168 | 4708 if(!IS_INTRA16x16(mb_type)){ |
4709 cbp= get_ue_golomb(&s->gb); | |
4710 if(cbp > 47){ | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
4711 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y); |
1168 | 4712 return -1; |
4713 } | |
2967 | 4714 |
7407 | 4715 if(CHROMA){ |
7408 | 4716 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp[cbp]; |
4717 else cbp= golomb_to_inter_cbp [cbp]; | |
7407 | 4718 }else{ |
4719 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp_gray[cbp]; | |
4720 else cbp= golomb_to_inter_cbp_gray[cbp]; | |
4721 } | |
1168 | 4722 } |
3651 | 4723 h->cbp = cbp; |
1168 | 4724 |
2755 | 4725 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
7378 | 4726 if(get_bits1(&s->gb)){ |
2755 | 4727 mb_type |= MB_TYPE_8x8DCT; |
7378 | 4728 h->cbp_table[mb_xy]= cbp; |
4729 } | |
2755 | 4730 } |
4731 s->current_picture.mb_type[mb_xy]= mb_type; | |
4732 | |
1168 | 4733 if(cbp || IS_INTRA16x16(mb_type)){ |
4734 int i8x8, i4x4, chroma_idx; | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4735 int dquant; |
1168 | 4736 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; |
3174 | 4737 const uint8_t *scan, *scan8x8, *dc_scan; |
2967 | 4738 |
1168 | 4739 // fill_non_zero_count_cache(h); |
4740 | |
4741 if(IS_INTERLACED(mb_type)){ | |
3316 | 4742 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0; |
2763 | 4743 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
1168 | 4744 dc_scan= luma_dc_field_scan; |
4745 }else{ | |
3316 | 4746 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0; |
2763 | 4747 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
1168 | 4748 dc_scan= luma_dc_zigzag_scan; |
4749 } | |
4750 | |
4751 dquant= get_se_golomb(&s->gb); | |
4752 | |
4753 if( dquant > 25 || dquant < -26 ){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4754 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 | 4755 return -1; |
4756 } | |
2967 | 4757 |
1168 | 4758 s->qscale += dquant; |
4759 if(((unsigned)s->qscale) > 51){ | |
4760 if(s->qscale<0) s->qscale+= 52; | |
4761 else s->qscale-= 52; | |
4762 } | |
2967 | 4763 |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
4764 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
|
4765 h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale); |
1168 | 4766 if(IS_INTRA16x16(mb_type)){ |
2919 | 4767 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
|
4768 return -1; //FIXME continue if partitioned and other return -1 too |
1168 | 4769 } |
4770 | |
4771 assert((cbp&15) == 0 || (cbp&15) == 15); | |
4772 | |
4773 if(cbp&15){ | |
4774 for(i8x8=0; i8x8<4; i8x8++){ | |
4775 for(i4x4=0; i4x4<4; i4x4++){ | |
4776 const int index= i4x4 + 4*i8x8; | |
2919 | 4777 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){ |
1168 | 4778 return -1; |
4779 } | |
4780 } | |
4781 } | |
4782 }else{ | |
1636 | 4783 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
1168 | 4784 } |
4785 }else{ | |
4786 for(i8x8=0; i8x8<4; i8x8++){ | |
4787 if(cbp & (1<<i8x8)){ | |
2755 | 4788 if(IS_8x8DCT(mb_type)){ |
4789 DCTELEM *buf = &h->mb[64*i8x8]; | |
2757 | 4790 uint8_t *nnz; |
2755 | 4791 for(i4x4=0; i4x4<4; i4x4++){ |
3174 | 4792 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4, |
2919 | 4793 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 ) |
2755 | 4794 return -1; |
4795 } | |
2757 | 4796 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
|
4797 nnz[0] += nnz[1] + nnz[8] + nnz[9]; |
2755 | 4798 }else{ |
4799 for(i4x4=0; i4x4<4; i4x4++){ | |
4800 const int index= i4x4 + 4*i8x8; | |
2967 | 4801 |
2919 | 4802 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 | 4803 return -1; |
4804 } | |
1168 | 4805 } |
4806 } | |
4807 }else{ | |
4808 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
4809 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
4810 } | |
4811 } | |
4812 } | |
2967 | 4813 |
1168 | 4814 if(cbp&0x30){ |
4815 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
2919 | 4816 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){ |
1168 | 4817 return -1; |
4818 } | |
4819 } | |
4820 | |
4821 if(cbp&0x20){ | |
4822 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
|
4823 const uint32_t *qmul = h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[chroma_idx]]; |
1168 | 4824 for(i4x4=0; i4x4<4; i4x4++){ |
4825 const int index= 16 + 4*chroma_idx + i4x4; | |
5225
099c495618c1
Compute the dequant coefficient table ptr outside the loop,
gpoirier
parents:
5215
diff
changeset
|
4826 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, qmul, 15) < 0){ |
1168 | 4827 return -1; |
4828 } | |
4829 } | |
4830 } | |
4831 }else{ | |
4832 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
4833 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
4834 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
4835 } | |
4836 }else{ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4837 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
|
4838 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
|
4839 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
|
4840 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
1168 | 4841 } |
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
|
4842 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 4843 write_back_non_zero_count(h); |
4844 | |
3316 | 4845 if(MB_MBAFF){ |
4846 h->ref_count[0] >>= 1; | |
4847 h->ref_count[1] >>= 1; | |
4848 } | |
4849 | |
1168 | 4850 return 0; |
4851 } | |
4852 | |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4853 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
|
4854 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
|
4855 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
|
4856 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
|
4857 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
|
4858 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
|
4859 |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4860 unsigned int ctx = 0; |
2967 | 4861 |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4862 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
|
4863 ctx += 1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4864 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4865 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
|
4866 ctx += 1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4867 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4868 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4869 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
|
4870 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4871 |
2312 | 4872 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
4873 uint8_t *state= &h->cabac_state[ctx_base]; | |
4874 int mb_type; | |
2967 | 4875 |
2312 | 4876 if(intra_slice){ |
4877 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
|
4878 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
|
4879 const int mbb_xy = h->top_mb_xy; |
2312 | 4880 int ctx=0; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4881 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
|
4882 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4883 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
|
4884 ctx++; |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4885 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 ) |
2312 | 4886 return 0; /* I4x4 */ |
4887 state += 2; | |
4888 }else{ | |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4889 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
|
4890 return 0; /* I4x4 */ |
2312 | 4891 } |
4892 | |
4893 if( get_cabac_terminate( &h->cabac ) ) | |
4894 return 25; /* PCM */ | |
4895 | |
4896 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
|
4897 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
|
4898 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
|
4899 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
|
4900 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
|
4901 mb_type += 1 * get_cabac_noinline( &h->cabac, &state[3+2*intra_slice] ); |
2312 | 4902 return mb_type; |
4903 } | |
4904 | |
4905 static int decode_cabac_mb_type( H264Context *h ) { | |
4906 MpegEncContext * const s = &h->s; | |
4907 | |
7340 | 4908 if( h->slice_type_nos == FF_I_TYPE ) { |
2312 | 4909 return decode_cabac_intra_mb_type(h, 3, 1); |
7340 | 4910 } else if( h->slice_type_nos == FF_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
|
4911 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
|
4912 /* 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
|
4913 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
3138 | 4914 /* 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
|
4915 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
|
4916 } else { |
3138 | 4917 /* 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
|
4918 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
|
4919 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4920 } else { |
2312 | 4921 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
|
4922 } |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4923 } else if( h->slice_type_nos == FF_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
|
4924 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
|
4925 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
|
4926 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
|
4927 int bits; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4928 |
3138 | 4929 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
|
4930 ctx++; |
3138 | 4931 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
|
4932 ctx++; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4933 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4934 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
|
4935 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
|
4936 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4937 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
|
4938 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
|
4939 } |
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4940 |
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4941 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
|
4942 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
|
4943 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
|
4944 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
|
4945 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
|
4946 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
|
4947 else if( bits == 13 ) { |
2312 | 4948 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
|
4949 } 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
|
4950 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
|
4951 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
|
4952 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
|
4953 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
4954 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
|
4955 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
|
4956 } else { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4957 /* 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
|
4958 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
|
4959 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4960 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4961 |
3316 | 4962 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
|
4963 MpegEncContext * const s = &h->s; |
3316 | 4964 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
|
4965 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
|
4966 |
3316 | 4967 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches? |
4968 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride; | |
4969 mba_xy = mb_xy - 1; | |
4970 if( (mb_y&1) | |
4971 && h->slice_table[mba_xy] == h->slice_num | |
4972 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) | |
4973 mba_xy += s->mb_stride; | |
4974 if( MB_FIELD ){ | |
4975 mbb_xy = mb_xy - s->mb_stride; | |
4976 if( !(mb_y&1) | |
4977 && h->slice_table[mbb_xy] == h->slice_num | |
4978 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) | |
4979 mbb_xy -= s->mb_stride; | |
4980 }else | |
4981 mbb_xy = mb_x + (mb_y-1)*s->mb_stride; | |
4982 }else{ | |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
4983 int mb_xy = h->mb_xy; |
3316 | 4984 mba_xy = mb_xy - 1; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
4985 mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE); |
3316 | 4986 } |
4987 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4988 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
|
4989 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4990 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
|
4991 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4992 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
4993 if( h->slice_type_nos == FF_B_TYPE ) |
3138 | 4994 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
|
4995 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
|
4996 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4997 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4998 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
|
4999 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
|
5000 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5001 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
|
5002 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
|
5003 |
2928 | 5004 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
5005 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
5006 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
5007 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5008 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
|
5009 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
|
5010 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5011 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
|
5012 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5013 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5014 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
|
5015 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
|
5016 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
|
5017 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5018 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
|
5019 |
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
|
5020 /* 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
|
5021 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
|
5022 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
|
5023 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5024 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
|
5025 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5026 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5027 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
|
5028 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
|
5029 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5030 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
|
5031 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
|
5032 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
|
5033 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
|
5034 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5035 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
|
5036 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5037 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5038 static int decode_cabac_mb_cbp_luma( H264Context *h) { |
5694
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5039 int cbp_b, cbp_a, ctx, cbp = 0; |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5040 |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5041 cbp_a = h->slice_table[h->left_mb_xy[0]] == h->slice_num ? h->left_cbp : -1; |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5042 cbp_b = h->slice_table[h->top_mb_xy] == h->slice_num ? h->top_cbp : -1; |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5043 |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5044 ctx = !(cbp_a & 0x02) + 2 * !(cbp_b & 0x04); |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5045 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]); |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5046 ctx = !(cbp & 0x01) + 2 * !(cbp_b & 0x08); |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5047 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 1; |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5048 ctx = !(cbp_a & 0x08) + 2 * !(cbp & 0x01); |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5049 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 2; |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5050 ctx = !(cbp & 0x04) + 2 * !(cbp & 0x02); |
7c2ce28a0314
Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.
diego
parents:
5685
diff
changeset
|
5051 cbp |= get_cabac_noinline(&h->cabac, &h->cabac_state[73 + ctx]) << 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
|
5052 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
|
5053 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5054 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
|
5055 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
|
5056 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
|
5057 |
2314 | 5058 cbp_a = (h->left_cbp>>4)&0x03; |
5059 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
|
5060 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 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
|
5066 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
5071 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5072 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
|
5073 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
|
5074 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
|
5075 |
3316 | 5076 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
|
5077 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5078 |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
5079 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
|
5080 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
|
5081 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
|
5082 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5083 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
|
5084 val++; |
3128 | 5085 if(val > 102) //prevent infinite loop |
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
5086 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
|
5087 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5088 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5089 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
|
5090 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
|
5091 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5092 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
|
5093 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5103 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
|
5104 int type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5105 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
|
5106 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
|
5107 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
|
5108 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
|
5109 type = 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5110 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
|
5111 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
|
5112 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
|
5113 type += 4; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5114 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5115 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
|
5116 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
|
5117 return type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5118 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5119 |
2755 | 5120 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
|
5121 return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); |
2755 | 5122 } |
5123 | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5124 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
|
5125 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
|
5126 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
|
5127 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
|
5128 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
|
5129 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
5130 if( h->slice_type_nos == FF_B_TYPE) { |
2396 | 5131 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) |
5132 ctx++; | |
5133 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
5134 ctx += 2; | |
5135 } else { | |
5136 if( refa > 0 ) | |
5137 ctx++; | |
5138 if( refb > 0 ) | |
5139 ctx += 2; | |
5140 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5141 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5142 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
|
5143 ref++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5144 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
|
5145 ctx = 4; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5146 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5147 ctx = 5; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5148 if(ref >= 32 /*h->ref_list[list]*/){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5149 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
|
5150 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
|
5151 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5152 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5153 return ref; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5154 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5155 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5156 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
|
5157 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
|
5158 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
|
5159 int ctxbase = (l == 0) ? 40 : 47; |
2317 | 5160 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
|
5161 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5162 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
|
5163 ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5164 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
|
5165 ctx = 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5166 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5167 ctx = 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5168 |
2317 | 5169 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
5170 return 0; | |
5171 | |
5172 mvd= 1; | |
5173 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
|
5174 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
|
5175 mvd++; |
2317 | 5176 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
|
5177 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5178 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5179 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5180 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
|
5181 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
|
5182 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
|
5183 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
|
5184 k++; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5185 if(k>24){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5186 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
|
5187 return INT_MIN; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5188 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5189 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5190 while( k-- ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5191 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
|
5192 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
|
5193 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5194 } |
4042 | 5195 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
|
5196 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5197 |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5198 static av_always_inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx, int is_dc ) { |
2314 | 5199 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
|
5200 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
|
5201 |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5202 if( is_dc ) { |
7181 | 5203 if( cat == 0 ) { |
5204 nza = h->left_cbp&0x100; | |
5205 nzb = h-> top_cbp&0x100; | |
5206 } else { | |
5207 nza = (h->left_cbp>>(6+idx))&0x01; | |
5208 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
5209 } | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5210 } else { |
7183
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5211 if( cat == 4 ) { |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5212 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5213 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5214 } else { |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5215 assert(cat == 1 || cat == 2); |
7181 | 5216 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
5217 nzb = h->non_zero_count_cache[scan8[idx] - 8]; | |
5218 } | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5219 } |
2314 | 5220 |
5221 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
|
5222 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5223 |
2314 | 5224 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
|
5225 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
|
5226 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5227 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
|
5228 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5229 |
6753 | 5230 DECLARE_ASM_CONST(1, uint8_t, last_coeff_flag_offset_8x8[63]) = { |
4051 | 5231 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
5232 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
5233 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
5234 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
5235 }; | |
5236 | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5237 static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff, int is_dc ) { |
3316 | 5238 static const int significant_coeff_flag_offset[2][6] = { |
5239 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 }, | |
5240 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 } | |
5241 }; | |
5242 static const int last_coeff_flag_offset[2][6] = { | |
5243 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 }, | |
5244 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 } | |
5245 }; | |
5246 static const int coeff_abs_level_m1_offset[6] = { | |
5247 227+0, 227+10, 227+20, 227+30, 227+39, 426 | |
5248 }; | |
4007 | 5249 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = { |
3316 | 5250 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, |
2755 | 5251 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, |
5252 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
3316 | 5253 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 }, |
5254 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5, | |
5255 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11, | |
5256 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9, | |
5257 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 } | |
2755 | 5258 }; |
6749
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5259 /* node ctx: 0..3: abslevel1 (with abslevelgt1 == 0). |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5260 * 4..7: abslevelgt1 + 3 (and abslevel1 doesn't matter). |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5261 * map node ctx => cabac ctx for level=1 */ |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5262 static const uint8_t coeff_abs_level1_ctx[8] = { 1, 2, 3, 4, 0, 0, 0, 0 }; |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5263 /* map node ctx => cabac ctx for level>1 */ |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5264 static const uint8_t coeff_abs_levelgt1_ctx[8] = { 5, 5, 5, 5, 6, 7, 8, 9 }; |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5265 static const uint8_t coeff_abs_level_transition[2][8] = { |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5266 /* update node ctx after decoding a level=1 */ |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5267 { 1, 2, 3, 3, 4, 5, 6, 7 }, |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5268 /* update node ctx after decoding a level>1 */ |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5269 { 4, 4, 4, 4, 5, 6, 7, 7 } |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5270 }; |
2755 | 5271 |
5272 int index[64]; | |
2313 | 5273 |
5262 | 5274 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
|
5275 int coeff_count = 0; |
6749
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5276 int node_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
|
5277 |
2898 | 5278 uint8_t *significant_coeff_ctx_base; |
5279 uint8_t *last_coeff_ctx_base; | |
5280 uint8_t *abs_level_m1_ctx_base; | |
2755 | 5281 |
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
|
5282 #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
|
5283 #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
|
5284 #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
|
5285 #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
|
5286 #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
|
5287 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
|
5288 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
|
5289 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
|
5290 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
|
5291 #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
|
5292 #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
|
5293 #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
|
5294 |
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
|
5295 |
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 /* 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
|
5297 * 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
|
5298 * 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
|
5299 * 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
|
5300 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
2755 | 5301 * 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
|
5302 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5303 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5304 /* read coded block flag */ |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5305 if( is_dc || cat != 5 ) { |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5306 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 0 ) { |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5307 if( !is_dc ) { |
7183
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5308 if( cat == 4 ) |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5309 h->non_zero_count_cache[scan8[16+n]] = 0; |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5310 else |
7181 | 5311 h->non_zero_count_cache[scan8[n]] = 0; |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5312 } |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5313 |
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
|
5314 #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
|
5315 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
|
5316 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
|
5317 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
|
5318 #endif |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5319 return; |
2755 | 5320 } |
2898 | 5321 } |
5322 | |
5323 significant_coeff_ctx_base = h->cabac_state | |
3316 | 5324 + significant_coeff_flag_offset[MB_FIELD][cat]; |
2898 | 5325 last_coeff_ctx_base = h->cabac_state |
3316 | 5326 + last_coeff_flag_offset[MB_FIELD][cat]; |
2898 | 5327 abs_level_m1_ctx_base = h->cabac_state |
5328 + coeff_abs_level_m1_offset[cat]; | |
5329 | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5330 if( !is_dc && cat == 5 ) { |
2898 | 5331 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \ |
5332 for(last= 0; last < coefs; last++) { \ | |
5333 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
|
5334 if( get_cabac( CC, sig_ctx )) { \ |
2898 | 5335 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \ |
5336 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
|
5337 if( get_cabac( CC, last_ctx ) ) { \ |
2898 | 5338 last= max_coeff; \ |
5339 break; \ | |
5340 } \ | |
5341 } \ | |
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
|
5342 }\ |
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
|
5343 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
|
5344 index[coeff_count++] = last;\ |
2898 | 5345 } |
4009 | 5346 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; |
5547 | 5347 #if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) |
4051 | 5348 coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); |
5349 } else { | |
5350 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); | |
5351 #else | |
3316 | 5352 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] ); |
2898 | 5353 } else { |
5354 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
|
5355 #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
|
5356 } |
2316 | 5357 assert(coeff_count > 0); |
5358 | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5359 if( is_dc ) { |
7181 | 5360 if( cat == 0 ) |
5361 h->cbp_table[h->mb_xy] |= 0x100; | |
5362 else | |
5363 h->cbp_table[h->mb_xy] |= 0x40 << n; | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5364 } else { |
7183
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5365 if( cat == 5 ) |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5366 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); |
7181 | 5367 else if( cat == 4 ) |
5368 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
5369 else { | |
7183
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5370 assert( cat == 1 || cat == 2 ); |
db32d2544050
Reorder the if/else for residual cats to match gcc's branch prediction.
astrange
parents:
7182
diff
changeset
|
5371 h->non_zero_count_cache[scan8[n]] = coeff_count; |
7181 | 5372 } |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5373 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5374 |
7444
a9da32d66fec
Small h264 decoding speed optimization: while->do/while
darkshikari
parents:
7424
diff
changeset
|
5375 do { |
6749
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5376 uint8_t *ctx = coeff_abs_level1_ctx[node_ctx] + abs_level_m1_ctx_base; |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5377 |
7444
a9da32d66fec
Small h264 decoding speed optimization: while->do/while
darkshikari
parents:
7424
diff
changeset
|
5378 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
|
5379 |
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
|
5380 if( get_cabac( CC, ctx ) == 0 ) { |
6749
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5381 node_ctx = coeff_abs_level_transition[0][node_ctx]; |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5382 if( is_dc ) { |
4040 | 5383 block[j] = get_cabac_bypass_sign( CC, -1); |
2316 | 5384 }else{ |
6377 | 5385 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6; |
2316 | 5386 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5387 } else { |
2313 | 5388 int coeff_abs = 2; |
6749
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5389 ctx = coeff_abs_levelgt1_ctx[node_ctx] + abs_level_m1_ctx_base; |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5390 node_ctx = coeff_abs_level_transition[1][node_ctx]; |
b1778cf7f3b1
Use a state machine to reduce branching logic in decode_cabac_residual.
astrange
parents:
6717
diff
changeset
|
5391 |
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
|
5392 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) { |
2313 | 5393 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
|
5394 } |
2313 | 5395 |
5396 if( coeff_abs >= 15 ) { | |
5397 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
|
5398 while( get_cabac_bypass( CC ) ) { |
2313 | 5399 j++; |
5400 } | |
2967 | 5401 |
4016 | 5402 coeff_abs=1; |
2313 | 5403 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
|
5404 coeff_abs += coeff_abs + get_cabac_bypass( CC ); |
2313 | 5405 } |
4016 | 5406 coeff_abs+= 14; |
2313 | 5407 } |
5408 | |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5409 if( is_dc ) { |
7184 | 5410 block[j] = get_cabac_bypass_sign( CC, -coeff_abs ); |
2316 | 5411 }else{ |
7184 | 5412 block[j] = (get_cabac_bypass_sign( CC, -coeff_abs ) * qmul[j] + 32) >> 6; |
2316 | 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 } |
7444
a9da32d66fec
Small h264 decoding speed optimization: while->do/while
darkshikari
parents:
7424
diff
changeset
|
5415 } while( coeff_count ); |
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
|
5416 #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
|
5417 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
|
5418 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
|
5419 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
|
5420 #endif |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5421 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5422 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5423 |
7180
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5424 #ifndef CONFIG_SMALL |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5425 static void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5426 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 1); |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5427 } |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5428 |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5429 static void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5430 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0); |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5431 } |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5432 #endif |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5433 |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5434 static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5435 #ifdef CONFIG_SMALL |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5436 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, cat == 0 || cat == 3); |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5437 #else |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5438 if( cat == 0 || cat == 3 ) decode_cabac_residual_dc(h, block, cat, n, scantable, qmul, max_coeff); |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5439 else decode_cabac_residual_nondc(h, block, cat, n, scantable, qmul, max_coeff); |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5440 #endif |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5441 } |
4acdafd254bf
Clone decode_cabac_residual() for DC residuals, to get rid of a bunch of branches in the main loop.
astrange
parents:
7179
diff
changeset
|
5442 |
4908
777f250df232
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
5443 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
|
5444 { |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5445 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
5446 const int mb_xy = h->mb_xy; |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5447 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
|
5448 h->left_mb_xy[0] = mb_xy - 1; |
3316 | 5449 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
|
5450 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
|
5451 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
|
5452 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
|
5453 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
3316 | 5454 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
|
5455 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
|
5456 if (bottom |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5457 ? !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
|
5458 : (!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
|
5459 ) { |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5460 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
|
5461 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5462 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
|
5463 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
|
5464 } |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
5465 } else if (FIELD_PICTURE) { |
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
5466 h->top_mb_xy -= s->mb_stride; |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5467 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5468 return; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5469 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5470 |
1908
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 * decodes a macroblock |
7374 | 5473 * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
1908
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 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
|
5476 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
5477 int 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
|
5478 int mb_type, partition_count, cbp = 0; |
2755 | 5479 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
|
5480 |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
5481 mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
5482 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5483 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
|
5484 |
4600 | 5485 tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
7338 | 5486 if( h->slice_type_nos != FF_I_TYPE ) { |
3316 | 5487 int skip; |
5488 /* a skipped mb needs the aff flag from the following mb */ | |
5489 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 ) | |
5490 predict_field_decoding_flag(h); | |
5491 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped ) | |
5492 skip = h->next_mb_skipped; | |
5493 else | |
5494 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
|
5495 /* read skip flags */ |
3316 | 5496 if( skip ) { |
5497 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ | |
5498 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; | |
5499 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); | |
5500 if(h->next_mb_skipped) | |
5501 predict_field_decoding_flag(h); | |
5502 else | |
5503 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | |
5504 } | |
5505 | |
2396 | 5506 decode_mb_skip(h); |
5507 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5508 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
|
5509 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
|
5510 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
|
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 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
|
5513 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5514 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5515 } |
3316 | 5516 if(FRAME_MBAFF){ |
5517 if( (s->mb_y&1) == 0 ) | |
5518 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
|
5519 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
7469
856df346b536
Remove useless mb_field_decoding_flag setting code that was at the wrong spot.
michael
parents:
7468
diff
changeset
|
5520 } |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo«Ác Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5521 |
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
|
5522 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
|
5523 |
3077 | 5524 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
|
5525 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
|
5526 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
|
5527 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
|
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 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
5530 if( h->slice_type_nos == FF_B_TYPE ) { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5531 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
|
5532 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
|
5533 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
|
5534 }else{ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5535 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
|
5536 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
|
5537 } |
7340 | 5538 } else if( h->slice_type_nos == FF_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
|
5539 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
|
5540 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
|
5541 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
|
5542 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5543 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
|
5544 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
|
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 } else { |
7340 | 5547 if(h->slice_type == FF_SI_TYPE && mb_type) |
5548 mb_type--; | |
5549 assert(h->slice_type_nos == FF_I_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
|
5550 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
|
5551 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
|
5552 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
|
5553 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
|
5554 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
|
5555 } |
3316 | 5556 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
|
5557 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
|
5558 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5559 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
|
5560 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5561 if(IS_INTRA_PCM(mb_type)) { |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5562 const uint8_t *ptr; |
2967 | 5563 |
5127 | 5564 // 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
|
5565 // 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
|
5566 // 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
|
5567 ptr= h->cabac.bytestream; |
4344 | 5568 if(h->cabac.low&0x1) ptr--; |
5569 if(CABAC_BITS==16){ | |
5570 if(h->cabac.low&0x1FF) ptr--; | |
5571 } | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5572 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5573 // The pixels are stored in the same order as levels in h->mb array. |
7450 | 5574 memcpy(h->mb, ptr, 256); ptr+=256; |
7407 | 5575 if(CHROMA){ |
7450 | 5576 memcpy(h->mb+128, ptr, 128); ptr+=128; |
7407 | 5577 } |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5578 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5579 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
|
5580 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5581 // All blocks are present |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5582 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
|
5583 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
|
5584 // In deblocking, the quantizer is 0 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5585 s->current_picture.qscale_table[mb_xy]= 0; |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5586 // All coeffs are present |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5587 memset(h->non_zero_count[mb_xy], 16, 16); |
2755 | 5588 s->current_picture.mb_type[mb_xy]= mb_type; |
7237
9a5cdba22eeb
H264: Fix decoding with CABAC/delta_qp/PCM macroblocks.
astrange
parents:
7225
diff
changeset
|
5589 h->last_qscale_diff = 0; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5590 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
|
5591 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5592 |
3316 | 5593 if(MB_MBAFF){ |
5594 h->ref_count[0] <<= 1; | |
5595 h->ref_count[1] <<= 1; | |
5596 } | |
5597 | |
2449 | 5598 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
|
5599 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5600 if( IS_INTRA( mb_type ) ) { |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
5601 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
|
5602 if( IS_INTRA4x4( mb_type ) ) { |
2755 | 5603 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
5604 mb_type |= MB_TYPE_8x8DCT; | |
5605 for( i = 0; i < 16; i+=4 ) { | |
5606 int pred = pred_intra_mode( h, i ); | |
5607 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
5608 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
5609 } | |
5610 } else { | |
5611 for( i = 0; i < 16; i++ ) { | |
5612 int pred = pred_intra_mode( h, i ); | |
5613 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
|
5614 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5615 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
2755 | 5616 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5617 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5618 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
|
5619 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
|
5620 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5621 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
|
5622 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
|
5623 } |
7407 | 5624 if(CHROMA){ |
7408 | 5625 h->chroma_pred_mode_table[mb_xy] = |
5626 pred_mode = decode_cabac_mb_chroma_pre_mode( h ); | |
5627 | |
5628 pred_mode= check_intra_pred_mode( h, pred_mode ); | |
5629 if( pred_mode < 0 ) return -1; | |
5630 h->chroma_pred_mode= pred_mode; | |
7407 | 5631 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5632 } 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
|
5633 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
|
5634 |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
5635 if( h->slice_type_nos == FF_B_TYPE ) { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5636 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
|
5637 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
|
5638 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
|
5639 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
|
5640 } |
3482 | 5641 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] | |
5642 h->sub_mb_type[2] | h->sub_mb_type[3]) ) { | |
2396 | 5643 pred_direct_motion(h, &mb_type); |
5425 | 5644 h->ref_cache[0][scan8[4]] = |
5645 h->ref_cache[1][scan8[4]] = | |
5646 h->ref_cache[0][scan8[12]] = | |
5647 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | |
2396 | 5648 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { |
5649 for( i = 0; i < 4; i++ ) | |
5650 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
5651 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
5652 } | |
5653 } | |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5654 } else { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5655 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
|
5656 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
|
5657 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
|
5658 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
|
5659 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5660 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5661 |
4533 | 5662 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
|
5663 for( i = 0; i < 4; i++ ) { |
2396 | 5664 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
5665 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
|
5666 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
|
5667 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
|
5668 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5669 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
|
5670 } else { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5671 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
|
5672 } |
2110 | 5673 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
|
5674 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
|
5675 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5676 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5677 |
2755 | 5678 if(dct8x8_allowed) |
5679 dct8x8_allowed = get_dct8x8_allowed(h); | |
5680 | |
4533 | 5681 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
|
5682 for(i=0; i<4; i++){ |
5425 | 5683 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]; |
2396 | 5684 if(IS_DIRECT(h->sub_mb_type[i])){ |
5685 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
5686 continue; | |
5687 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5688 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5689 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
|
5690 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
|
5691 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
|
5692 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
|
5693 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
|
5694 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
|
5695 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
|
5696 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
|
5697 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
|
5698 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
|
5699 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5700 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
|
5701 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 ); |
4600 | 5702 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
|
5703 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5704 if(IS_SUB_8X8(sub_mb_type)){ |
4530 | 5705 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
|
5706 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
4530 | 5707 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
|
5708 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
|
5709 |
4530 | 5710 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
|
5711 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx; |
4530 | 5712 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
|
5713 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
|
5714 }else if(IS_SUB_8X4(sub_mb_type)){ |
4530 | 5715 mv_cache[ 1 ][0]= mx; |
5716 mv_cache[ 1 ][1]= my; | |
5717 | |
5718 mvd_cache[ 1 ][0]= mx - mpx; | |
5719 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
|
5720 }else if(IS_SUB_4X8(sub_mb_type)){ |
4530 | 5721 mv_cache[ 8 ][0]= mx; |
5722 mv_cache[ 8 ][1]= my; | |
5723 | |
5724 mvd_cache[ 8 ][0]= mx - mpx; | |
5725 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
|
5726 } |
4530 | 5727 mv_cache[ 0 ][0]= mx; |
5728 mv_cache[ 0 ][1]= my; | |
5729 | |
5730 mvd_cache[ 0 ][0]= mx - mpx; | |
5731 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
|
5732 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5733 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5734 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
|
5735 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
|
5736 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
|
5737 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
|
5738 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5739 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5740 } |
2396 | 5741 } else if( IS_DIRECT(mb_type) ) { |
5742 pred_direct_motion(h, &mb_type); | |
5743 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
5744 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
2755 | 5745 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
2396 | 5746 } else { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5747 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
|
5748 if(IS_16X16(mb_type)){ |
4534 | 5749 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
|
5750 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
|
5751 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
|
5752 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); |
2523 | 5753 }else |
4534 | 5754 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 |
5755 } | |
5756 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
|
5757 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
|
5758 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
|
5759 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5760 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
|
5761 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 ); |
4600 | 5762 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
|
5763 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5764 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
|
5765 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
2523 | 5766 }else |
5767 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
|
5768 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5769 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5770 else if(IS_16X8(mb_type)){ |
4533 | 5771 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
|
5772 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
|
5773 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
|
5774 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
|
5775 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
2396 | 5776 }else |
5777 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
|
5778 } |
4533 | 5779 } |
5780 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
|
5781 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
|
5782 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
|
5783 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
|
5784 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
|
5785 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 ); |
4600 | 5786 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
|
5787 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5788 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
|
5789 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
2523 | 5790 }else{ |
2396 | 5791 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
5792 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
|
5793 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5794 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5795 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5796 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5797 assert(IS_8X16(mb_type)); |
4533 | 5798 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
|
5799 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
|
5800 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
|
5801 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
|
5802 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
2396 | 5803 }else |
5804 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
|
5805 } |
4533 | 5806 } |
5807 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
|
5808 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
|
5809 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
|
5810 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
|
5811 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
|
5812 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
|
5813 |
4600 | 5814 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
|
5815 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
|
5816 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
2523 | 5817 }else{ |
2396 | 5818 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
5819 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
|
5820 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5821 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5822 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5823 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5824 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5825 |
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
|
5826 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
|
5827 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
|
5828 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
|
5829 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5830 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5831 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
|
5832 cbp = decode_cabac_mb_cbp_luma( h ); |
7407 | 5833 if(CHROMA) |
7408 | 5834 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5835 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5836 |
3651 | 5837 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
|
5838 |
2755 | 5839 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
5840 if( decode_cabac_mb_transform_size( h ) ) | |
5841 mb_type |= MB_TYPE_8x8DCT; | |
5842 } | |
5843 s->current_picture.mb_type[mb_xy]= mb_type; | |
5844 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5845 if( cbp || IS_INTRA16x16( mb_type ) ) { |
3174 | 5846 const uint8_t *scan, *scan8x8, *dc_scan; |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5847 const uint32_t *qmul; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5848 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
|
5849 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5850 if(IS_INTERLACED(mb_type)){ |
3316 | 5851 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; |
2763 | 5852 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
|
5853 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
|
5854 }else{ |
3316 | 5855 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; |
2763 | 5856 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
|
5857 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
|
5858 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5859 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5860 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
|
5861 if( dqp == INT_MIN ){ |
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
5862 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
|
5863 return -1; |
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
5864 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5865 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
|
5866 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
|
5867 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
|
5868 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
|
5869 } |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
5870 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
|
5871 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
|
5872 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5873 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
|
5874 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
|
5875 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5876 decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16); |
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5877 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5878 if( cbp&15 ) { |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5879 qmul = h->dequant4_coeff[0][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
|
5880 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
|
5881 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5882 decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, qmul, 15); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5883 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5884 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5885 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
|
5886 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5887 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5888 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
|
5889 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
|
5890 if( cbp & (1<<i8x8) ) { |
2755 | 5891 if( IS_8x8DCT(mb_type) ) { |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5892 decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, |
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5893 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64); |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5894 } else { |
5713 | 5895 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale]; |
5896 for( i4x4 = 0; i4x4 < 4; i4x4++ ) { | |
5897 const int index = 4*i8x8 + i4x4; | |
5898 //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
|
5899 //START_TIMER |
5713 | 5900 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, qmul, 16); |
3972
f5f1c9af095d
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents:
3955
diff
changeset
|
5901 //STOP_TIMER("decode_residual") |
5713 | 5902 } |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5903 } |
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 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5905 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
|
5906 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
|
5907 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5908 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5909 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5910 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5911 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
|
5912 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
|
5913 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
|
5914 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5915 decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5916 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5917 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5918 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5919 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
|
5920 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
|
5921 for( c = 0; c < 2; c++ ) { |
5705
c08c9340c7ca
factor out dequant table lookup outside loops, gives a 1-2% speed-up
gpoirier
parents:
5698
diff
changeset
|
5922 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
|
5923 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
|
5924 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
|
5925 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
5528
4c3b1222ff57
Don't check the return value of decode_cabac_residual since it always
conrad
parents:
5508
diff
changeset
|
5926 decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, qmul, 15); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5927 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5928 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5929 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5930 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
|
5931 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
|
5932 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
|
5933 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5934 } else { |
2315 | 5935 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
5936 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
5937 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
5938 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
3316 | 5939 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
|
5940 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5941 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5942 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
|
5943 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
|
5944 |
3316 | 5945 if(MB_MBAFF){ |
5946 h->ref_count[0] >>= 1; | |
5947 h->ref_count[1] >>= 1; | |
5948 } | |
5949 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5950 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
|
5951 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5952 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5953 |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
5954 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
|
5955 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
|
5956 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
|
5957 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
|
5958 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
|
5959 |
2633 | 5960 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
|
5961 int8_t tc[4]; |
2633 | 5962 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
|
5963 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
2633 | 5964 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); |
5965 } else { | |
5966 /* 16px edge length, because bS=4 is triggered by being at | |
5967 * the edge of an intra MB, so all 4 bS are the same */ | |
5968 for( d = 0; d < 16; d++ ) { | |
1898 | 5969 const int p0 = pix[-1]; |
5970 const int p1 = pix[-2]; | |
5971 const int p2 = pix[-3]; | |
5972 | |
5973 const int q0 = pix[0]; | |
5974 const int q1 = pix[1]; | |
5975 const int q2 = pix[2]; | |
5976 | |
4001 | 5977 if( FFABS( p0 - q0 ) < alpha && |
5978 FFABS( p1 - p0 ) < beta && | |
5979 FFABS( q1 - q0 ) < beta ) { | |
5980 | |
5981 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
5982 if( FFABS( p2 - p0 ) < beta) | |
1898 | 5983 { |
5984 const int p3 = pix[-4]; | |
5985 /* p0', p1', p2' */ | |
5986 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
5987 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
5988 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
5989 } else { | |
5990 /* p0' */ | |
5991 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
5992 } | |
4001 | 5993 if( FFABS( q2 - q0 ) < beta) |
1898 | 5994 { |
5995 const int q3 = pix[3]; | |
5996 /* q0', q1', q2' */ | |
5997 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
5998 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
5999 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
6000 } else { | |
6001 /* q0' */ | |
6002 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6003 } | |
6004 }else{ | |
6005 /* p0', q0' */ | |
6006 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6007 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6008 } | |
4600 | 6009 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
|
6010 } |
1898 | 6011 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
|
6012 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6013 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6014 } |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6015 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
2834 | 6016 int i; |
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6017 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
|
6018 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
|
6019 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
|
6020 |
2633 | 6021 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
|
6022 int8_t tc[4]; |
2633 | 6023 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
|
6024 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
2633 | 6025 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); |
6026 } else { | |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6027 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
|
6028 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6029 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6030 |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6031 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
|
6032 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6033 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
|
6034 int index_a; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6035 int alpha; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6036 int beta; |
2967 | 6037 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6038 int qp_index; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6039 int bS_index = (i >> 1); |
3316 | 6040 if (!MB_FIELD) { |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6041 bS_index &= ~1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6042 bS_index |= (i & 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6043 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6044 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6045 if( bS[bS_index] == 0 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6046 continue; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6047 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6048 |
3316 | 6049 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
|
6050 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
|
6051 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
|
6052 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
|
6053 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6054 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
|
6055 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
|
6056 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6057 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6058 const int p2 = pix[-3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6059 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6060 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6061 const int q2 = pix[2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6062 |
4001 | 6063 if( FFABS( p0 - q0 ) < alpha && |
6064 FFABS( p1 - p0 ) < beta && | |
6065 FFABS( q1 - q0 ) < beta ) { | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6066 int tc = tc0; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6067 int i_delta; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6068 |
4001 | 6069 if( FFABS( p2 - p0 ) < beta ) { |
4594 | 6070 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
|
6071 tc++; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6072 } |
4001 | 6073 if( FFABS( q2 - q0 ) < beta ) { |
4594 | 6074 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
|
6075 tc++; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6076 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6077 |
4594 | 6078 i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
6079 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
6080 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
4600 | 6081 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
|
6082 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6083 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6084 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6085 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6086 const int p2 = pix[-3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6087 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6088 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6089 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6090 const int q2 = pix[2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6091 |
4001 | 6092 if( FFABS( p0 - q0 ) < alpha && |
6093 FFABS( p1 - p0 ) < beta && | |
6094 FFABS( q1 - q0 ) < beta ) { | |
6095 | |
6096 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
6097 if( FFABS( p2 - p0 ) < beta) | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6098 { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6099 const int p3 = pix[-4]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6100 /* p0', p1', p2' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6101 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
|
6102 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
|
6103 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
|
6104 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6105 /* p0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6106 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
|
6107 } |
4001 | 6108 if( FFABS( q2 - q0 ) < beta) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6109 { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6110 const int q3 = pix[3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6111 /* q0', q1', q2' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6112 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
|
6113 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
|
6114 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
|
6115 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6116 /* q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6117 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
|
6118 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6119 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6120 /* p0', q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6121 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
|
6122 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
|
6123 } |
4600 | 6124 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
|
6125 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6126 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6127 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6128 } |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6129 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
|
6130 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6131 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
|
6132 int index_a; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6133 int alpha; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6134 int beta; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6135 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6136 int qp_index; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6137 int bS_index = i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6138 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6139 if( bS[bS_index] == 0 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6140 continue; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6141 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6142 |
3316 | 6143 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
|
6144 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
|
6145 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
|
6146 beta = (beta_table+52)[qp[qp_index] + h->slice_beta_offset]; |
3316 | 6147 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6148 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
|
6149 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
|
6150 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6151 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6152 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6153 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6154 |
4001 | 6155 if( FFABS( p0 - q0 ) < alpha && |
6156 FFABS( p1 - p0 ) < beta && | |
6157 FFABS( q1 - q0 ) < beta ) { | |
4594 | 6158 const int i_delta = av_clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
6159 | |
6160 pix[-1] = av_clip_uint8( p0 + i_delta ); /* p0' */ | |
6161 pix[0] = av_clip_uint8( q0 - i_delta ); /* q0' */ | |
4600 | 6162 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
|
6163 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6164 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6165 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6166 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6167 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6168 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6169 |
4001 | 6170 if( FFABS( p0 - q0 ) < alpha && |
6171 FFABS( p1 - p0 ) < beta && | |
6172 FFABS( q1 - q0 ) < beta ) { | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6173 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6174 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
|
6175 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ |
4600 | 6176 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
|
6177 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6178 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6179 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6180 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6181 |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6182 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
|
6183 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
|
6184 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
|
6185 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
|
6186 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
|
6187 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
|
6188 |
2633 | 6189 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
|
6190 int8_t tc[4]; |
2633 | 6191 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
|
6192 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] : -1; |
2633 | 6193 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); |
6194 } else { | |
6195 /* 16px edge length, see filter_mb_edgev */ | |
6196 for( d = 0; d < 16; d++ ) { | |
1898 | 6197 const int p0 = pix[-1*pix_next]; |
6198 const int p1 = pix[-2*pix_next]; | |
6199 const int p2 = pix[-3*pix_next]; | |
6200 const int q0 = pix[0]; | |
6201 const int q1 = pix[1*pix_next]; | |
6202 const int q2 = pix[2*pix_next]; | |
6203 | |
4001 | 6204 if( FFABS( p0 - q0 ) < alpha && |
6205 FFABS( p1 - p0 ) < beta && | |
6206 FFABS( q1 - q0 ) < beta ) { | |
1898 | 6207 |
6208 const int p3 = pix[-4*pix_next]; | |
6209 const int q3 = pix[ 3*pix_next]; | |
6210 | |
4001 | 6211 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ |
6212 if( FFABS( p2 - p0 ) < beta) { | |
1898 | 6213 /* p0', p1', p2' */ |
6214 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
6215 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
6216 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
6217 } else { | |
6218 /* p0' */ | |
6219 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6220 } | |
4001 | 6221 if( FFABS( q2 - q0 ) < beta) { |
1898 | 6222 /* q0', q1', q2' */ |
6223 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
6224 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
6225 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
6226 } else { | |
6227 /* q0' */ | |
6228 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6229 } | |
6230 }else{ | |
6231 /* p0', q0' */ | |
6232 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6233 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6234 } | |
4600 | 6235 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
|
6236 } |
1898 | 6237 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
|
6238 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6239 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6240 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6241 |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6242 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) { |
2834 | 6243 int i; |
4118
a1786732cd62
merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
michael
parents:
4113
diff
changeset
|
6244 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
|
6245 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
|
6246 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
|
6247 |
2633 | 6248 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
|
6249 int8_t tc[4]; |
2633 | 6250 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
|
6251 tc[i] = bS[i] ? (tc0_table+52)[index_a][bS[i] - 1] + 1 : 0; |
2633 | 6252 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); |
6253 } else { | |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6254 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
|
6255 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6256 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6257 |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6258 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
|
6259 MpegEncContext * const s = &h->s; |
5883
c64d94561b19
Fix deblocking filter for field pictures by properly looking for first
heydowns
parents:
5878
diff
changeset
|
6260 int mb_y_firstrow = s->picture_structure == PICT_BOTTOM_FIELD; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6261 int mb_xy, mb_type; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6262 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6263 |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
6264 mb_xy = h->mb_xy; |
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
|
6265 |
5883
c64d94561b19
Fix deblocking filter for field pictures by properly looking for first
heydowns
parents:
5878
diff
changeset
|
6266 if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff || |
7332 | 6267 1 || |
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
|
6268 (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
|
6269 h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) { |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6270 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
|
6271 return; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6272 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6273 assert(!FRAME_MBAFF); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6274 |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6275 mb_type = s->current_picture.mb_type[mb_xy]; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6276 qp = s->current_picture.qscale_table[mb_xy]; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6277 qp0 = s->current_picture.qscale_table[mb_xy-1]; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6278 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
|
6279 qpc = get_chroma_qp( h, 0, qp ); |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6280 qpc0 = get_chroma_qp( h, 0, qp0 ); |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6281 qpc1 = get_chroma_qp( h, 0, qp1 ); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6282 qp0 = (qp + qp0 + 1) >> 1; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6283 qp1 = (qp + qp1 + 1) >> 1; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6284 qpc0 = (qpc + qpc0 + 1) >> 1; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6285 qpc1 = (qpc + qpc1 + 1) >> 1; |
3651 | 6286 qp_thresh = 15 - h->slice_alpha_c0_offset; |
6287 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh && | |
6288 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh) | |
6289 return; | |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6290 |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6291 if( IS_INTRA(mb_type) ) { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6292 int16_t bS4[4] = {4,4,4,4}; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6293 int16_t bS3[4] = {3,3,3,3}; |
5797 | 6294 int16_t *bSH = FIELD_PICTURE ? bS3 : bS4; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6295 if( IS_8x8DCT(mb_type) ) { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6296 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6297 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
5797 | 6298 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 ); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6299 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6300 } else { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6301 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6302 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6303 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6304 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp ); |
5797 | 6305 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bSH, qp1 ); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6306 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6307 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6308 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6309 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6310 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6311 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6312 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6313 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc ); |
5797 | 6314 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bSH, qpc1 ); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6315 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
5797 | 6316 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bSH, qpc1 ); |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6317 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc ); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6318 return; |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6319 } else { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6320 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6321 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS; |
3651 | 6322 int edges; |
6323 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) { | |
6324 edges = 4; | |
6325 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL; | |
6326 } else { | |
6327 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : | |
6328 (mb_type & MB_TYPE_16x8) ? 1 : 0; | |
6329 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
6330 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16)) | |
6331 ? 3 : 0; | |
6332 int step = IS_8x8DCT(mb_type) ? 2 : 1; | |
6333 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; | |
6334 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache, | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
6335 (h->slice_type_nos == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE); |
3651 | 6336 } |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6337 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) ) |
5822
b49be74d387c
Fix mix-up of values in r10690 (deblocking for PAFF).
cehoyos
parents:
5815
diff
changeset
|
6338 bSv[0][0] = 0x0004000400040004ULL; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6339 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) ) |
5822
b49be74d387c
Fix mix-up of values in r10690 (deblocking for PAFF).
cehoyos
parents:
5815
diff
changeset
|
6340 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6341 |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6342 #define FILTER(hv,dir,edge)\ |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6343 if(bSv[dir][edge]) {\ |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6344 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
|
6345 if(!(edge&1)) {\ |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6346 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
|
6347 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
|
6348 }\ |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6349 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6350 if( edges == 1 ) { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6351 FILTER(v,0,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6352 FILTER(h,1,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6353 } else if( IS_8x8DCT(mb_type) ) { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6354 FILTER(v,0,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6355 FILTER(v,0,2); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6356 FILTER(h,1,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6357 FILTER(h,1,2); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6358 } else { |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6359 FILTER(v,0,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6360 FILTER(v,0,1); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6361 FILTER(v,0,2); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6362 FILTER(v,0,3); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6363 FILTER(h,1,0); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6364 FILTER(h,1,1); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6365 FILTER(h,1,2); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6366 FILTER(h,1,3); |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6367 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6368 #undef FILTER |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6369 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6370 } |
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6371 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6372 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
|
6373 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
|
6374 const int mb_xy= mb_x + mb_y*s->mb_stride; |
3316 | 6375 const int mb_type = s->current_picture.mb_type[mb_xy]; |
6376 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
|
6377 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
|
6378 int 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
|
6379 |
3101 | 6380 //for sufficiently low qp, filtering wouldn't do anything |
6381 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp | |
3316 | 6382 if(!FRAME_MBAFF){ |
6655
22cca5d3173a
Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents:
6604
diff
changeset
|
6383 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]); |
3101 | 6384 int qp = s->current_picture.qscale_table[mb_xy]; |
6385 if(qp <= qp_thresh | |
6386 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh) | |
6387 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){ | |
6388 return; | |
6389 } | |
6390 } | |
6391 | |
7378 | 6392 // CAVLC 8x8dct requires NNZ values for residual decoding that differ from what the loop filter needs |
6393 if(!h->pps.cabac && h->pps.transform_8x8_mode){ | |
6394 int top_type, left_type[2]; | |
6395 top_type = s->current_picture.mb_type[h->top_mb_xy] ; | |
6396 left_type[0] = s->current_picture.mb_type[h->left_mb_xy[0]]; | |
6397 left_type[1] = s->current_picture.mb_type[h->left_mb_xy[1]]; | |
6398 | |
6399 if(IS_8x8DCT(top_type)){ | |
6400 h->non_zero_count_cache[4+8*0]= | |
6401 h->non_zero_count_cache[5+8*0]= h->cbp_table[h->top_mb_xy] & 4; | |
6402 h->non_zero_count_cache[6+8*0]= | |
6403 h->non_zero_count_cache[7+8*0]= h->cbp_table[h->top_mb_xy] & 8; | |
6404 } | |
6405 if(IS_8x8DCT(left_type[0])){ | |
6406 h->non_zero_count_cache[3+8*1]= | |
6407 h->non_zero_count_cache[3+8*2]= h->cbp_table[h->left_mb_xy[0]]&2; //FIXME check MBAFF | |
6408 } | |
6409 if(IS_8x8DCT(left_type[1])){ | |
6410 h->non_zero_count_cache[3+8*3]= | |
6411 h->non_zero_count_cache[3+8*4]= h->cbp_table[h->left_mb_xy[1]]&8; //FIXME check MBAFF | |
6412 } | |
6413 | |
6414 if(IS_8x8DCT(mb_type)){ | |
6415 h->non_zero_count_cache[scan8[0 ]]= h->non_zero_count_cache[scan8[1 ]]= | |
6416 h->non_zero_count_cache[scan8[2 ]]= h->non_zero_count_cache[scan8[3 ]]= h->cbp_table[mb_xy] & 1; | |
6417 | |
6418 h->non_zero_count_cache[scan8[0+ 4]]= h->non_zero_count_cache[scan8[1+ 4]]= | |
6419 h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp_table[mb_xy] & 2; | |
6420 | |
6421 h->non_zero_count_cache[scan8[0+ 8]]= h->non_zero_count_cache[scan8[1+ 8]]= | |
6422 h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp_table[mb_xy] & 4; | |
6423 | |
6424 h->non_zero_count_cache[scan8[0+12]]= h->non_zero_count_cache[scan8[1+12]]= | |
6425 h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp_table[mb_xy] & 8; | |
6426 } | |
6427 } | |
6428 | |
3316 | 6429 if (FRAME_MBAFF |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6430 // left mb is in picture |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6431 && 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
|
6432 // and current and left pair do not have the same interlaced type |
3316 | 6433 && (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
|
6434 // 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
|
6435 && (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
|
6436 /* 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
|
6437 * 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
|
6438 */ |
3316 | 6439 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride; |
6440 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
|
6441 int16_t bS[8]; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6442 int qp[2]; |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6443 int bqp[2]; |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6444 int rqp[2]; |
3316 | 6445 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
|
6446 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6447 first_vertical_edge_done = 1; |
3316 | 6448 |
6449 if( IS_INTRA(mb_type) ) | |
6450 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4; | |
6451 else { | |
6452 for( i = 0; i < 8; i++ ) { | |
6453 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1]; | |
6454 | |
6455 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) | |
6456 bS[i] = 4; | |
6457 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || | |
6458 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ | |
6459 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) | |
6460 bS[i] = 2; | |
6461 else | |
6462 bS[i] = 1; | |
6463 } | |
6464 } | |
6465 | |
6466 mb_qp = s->current_picture.qscale_table[mb_xy]; | |
6467 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]]; | |
6468 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]]; | |
6469 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
|
6470 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
|
6471 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
|
6472 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
|
6473 get_chroma_qp( h, 1, mbn0_qp ) + 1 ) >> 1; |
3316 | 6474 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
|
6475 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
|
6476 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
|
6477 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
|
6478 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1; |
3316 | 6479 |
6480 /* Filter edge */ | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6481 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 | 6482 { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } |
3316 | 6483 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
|
6484 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
|
6485 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
|
6486 } |
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
|
6487 /* 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
|
6488 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
|
6489 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6490 int edge; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6491 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
2924 | 6492 const int mbm_type = s->current_picture.mb_type[mbm_xy]; |
7343 | 6493 int (*ref2frm) [48+2] = h->ref2frm[ h->slice_num &15 ]; |
6494 int (*ref2frmm)[48+2] = h->ref2frm[ h->slice_table[mbm_xy]&15 ]; | |
2454 | 6495 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
6496 | |
3101 | 6497 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP)) |
6498 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4; | |
2926 | 6499 // how often to recheck mv-based bS when iterating between edges |
6500 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 : | |
6501 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0; | |
6502 // how often to recheck mv-based bS when iterating along each edge | |
6503 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); | |
6504 | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6505 if (first_vertical_edge_done) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6506 start = 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6507 first_vertical_edge_done = 0; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6508 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6509 |
2454 | 6510 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
|
6511 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
|
6512 |
3316 | 6513 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0 |
6514 && !IS_INTERLACED(mb_type) | |
6515 && IS_INTERLACED(mbm_type) | |
6516 ) { | |
6517 // This is a special case in the norm where the filtering must | |
6518 // be done twice (one each of the field) even if we are in a | |
6519 // frame macroblock. | |
6520 // | |
6521 static const int nnz_idx[4] = {4,5,6,3}; | |
6522 unsigned int tmp_linesize = 2 * linesize; | |
6523 unsigned int tmp_uvlinesize = 2 * uvlinesize; | |
6524 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
|
6525 int qp; |
3316 | 6526 int i, j; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6527 int16_t bS[4]; |
3316 | 6528 |
6529 for(j=0; j<2; j++, mbn_xy += s->mb_stride){ | |
6530 if( IS_INTRA(mb_type) || | |
6531 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) { | |
6532 bS[0] = bS[1] = bS[2] = bS[3] = 3; | |
6533 } else { | |
6534 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy]; | |
6535 for( i = 0; i < 4; i++ ) { | |
6536 if( h->non_zero_count_cache[scan8[0]+i] != 0 || | |
6537 mbn_nnz[nnz_idx[i]] != 0 ) | |
6538 bS[i] = 2; | |
6539 else | |
6540 bS[i] = 1; | |
6541 } | |
6542 } | |
6543 // Do not use s->qscale as luma quantizer because it has not the same | |
6544 // value in IPCM macroblocks. | |
6545 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; | |
4600 | 6546 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); |
6547 { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); } | |
3316 | 6548 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
|
6549 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
|
6550 ( 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
|
6551 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
|
6552 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1); |
3316 | 6553 } |
6554 | |
6555 start = 1; | |
6556 } | |
6557 | |
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
|
6558 /* Calculate bS */ |
2924 | 6559 for( edge = start; edge < edges; edge++ ) { |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6560 /* mbn_xy: neighbor macroblock */ |
2924 | 6561 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
6562 const int mbn_type = s->current_picture.mb_type[mbn_xy]; | |
7343 | 6563 int (*ref2frmn)[48+2] = edge > 0 ? ref2frm : ref2frmm; |
3645
47821be55b6c
mmx implementation of deblocking strength decision.
lorenm
parents:
3519
diff
changeset
|
6564 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
|
6565 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
|
6566 |
2924 | 6567 if( (edge&1) && IS_8x8DCT(mb_type) ) |
2755 | 6568 continue; |
6569 | |
2924 | 6570 if( IS_INTRA(mb_type) || |
6571 IS_INTRA(mbn_type) ) { | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6572 int value; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6573 if (edge == 0) { |
2924 | 6574 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type)) |
3316 | 6575 || ((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
|
6576 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6577 value = 4; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6578 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6579 value = 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6580 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6581 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6582 value = 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6583 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6584 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
|
6585 } else { |
2924 | 6586 int i, l; |
6587 int mv_done; | |
6588 | |
6589 if( edge & mask_edge ) { | |
6590 bS[0] = bS[1] = bS[2] = bS[3] = 0; | |
6591 mv_done = 1; | |
6592 } | |
3316 | 6593 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) { |
6594 bS[0] = bS[1] = bS[2] = bS[3] = 1; | |
6595 mv_done = 1; | |
6596 } | |
2924 | 6597 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) { |
6598 int b_idx= 8 + 4 + edge * (dir ? 8:1); | |
6599 int bn_idx= b_idx - (dir ? 8:1); | |
6600 int v = 0; | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
6601 |
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
6602 for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) { |
7348
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6603 v |= ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[l][h->ref_cache[l][bn_idx]+2] || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6604 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6605 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit; |
2924 | 6606 } |
7348
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6607 |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6608 if(h->slice_type_nos == FF_B_TYPE && v){ |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6609 v=0; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6610 for( l = 0; !v && l < 2; l++ ) { |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6611 int ln= 1-l; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6612 v |= ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6613 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6614 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6615 } |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6616 } |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6617 |
2924 | 6618 bS[0] = bS[1] = bS[2] = bS[3] = v; |
6619 mv_done = 1; | |
6620 } | |
6621 else | |
6622 mv_done = 0; | |
6623 | |
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
|
6624 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
|
6625 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
|
6626 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
|
6627 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
|
6628 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
|
6629 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6630 if( h->non_zero_count_cache[b_idx] != 0 || |
2449 | 6631 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
|
6632 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
|
6633 } |
2924 | 6634 else if(!mv_done) |
2523 | 6635 { |
6636 bS[i] = 0; | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
6637 for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) { |
7348
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6638 if( ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[l][h->ref_cache[l][bn_idx]+2] || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6639 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6640 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) { |
2523 | 6641 bS[i] = 1; |
6642 break; | |
6643 } | |
6644 } | |
7348
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6645 |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6646 if(h->slice_type_nos == FF_B_TYPE && bS[i]){ |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6647 bS[i] = 0; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6648 for( l = 0; l < 2; l++ ) { |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6649 int ln= 1-l; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6650 if( ref2frm[l][h->ref_cache[l][b_idx]+2] != ref2frmn[ln][h->ref_cache[ln][bn_idx]+2] || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6651 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 || |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6652 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit ) { |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6653 bS[i] = 1; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6654 break; |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6655 } |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6656 } |
39e5cadcebab
3rd try to get the loop filter ref/mv check working correctly.
michael
parents:
7347
diff
changeset
|
6657 } |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6658 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6659 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6660 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6661 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
|
6662 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
|
6663 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6664 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6665 /* Filter edge */ |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6666 // 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
|
6667 // value in IPCM macroblocks. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6668 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
4600 | 6669 //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]); |
6670 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); | |
6671 { 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
|
6672 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
|
6673 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
1898 | 6674 if( (edge&1) == 0 ) { |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6675 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
|
6676 ( 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
|
6677 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
|
6678 ( 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
|
6679 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6680 } 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
|
6681 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
1898 | 6682 if( (edge&1) == 0 ) { |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
6683 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
|
6684 ( 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
|
6685 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
|
6686 ( 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
|
6687 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6688 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6689 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6690 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6691 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6692 |
5642 | 6693 static int decode_slice(struct AVCodecContext *avctx, H264Context *h){ |
1168 | 6694 MpegEncContext * const s = &h->s; |
6695 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
6696 | |
6697 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
|
6698 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6699 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
|
6700 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
|
6701 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6702 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6703 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
|
6704 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6705 /* 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
|
6706 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
|
6707 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
|
6708 s->gb.buffer + get_bits_count(&s->gb)/8, |
2116 | 6709 ( 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
|
6710 /* calculate pre-state */ |
2755 | 6711 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
|
6712 int pre; |
7340 | 6713 if( h->slice_type_nos == FF_I_TYPE ) |
4594 | 6714 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
|
6715 else |
4594 | 6716 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
|
6717 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6718 if( pre <= 63 ) |
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
6719 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
|
6720 else |
3976
27e90123b346
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents:
3972
diff
changeset
|
6721 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
1168 | 6722 } |
6723 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6724 for(;;){ |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
6725 //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
|
6726 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
|
6727 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
|
6728 //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
|
6729 |
2163 | 6730 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
|
6731 |
3316 | 6732 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
|
6733 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
|
6734 |
2163 | 6735 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
|
6736 |
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
6737 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
|
6738 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
|
6739 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6740 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
|
6741 |
3948
3edbf131ee44
refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents:
3947
diff
changeset
|
6742 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) { |
5153 | 6743 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
|
6744 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
|
6745 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
|
6746 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6747 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6748 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
|
6749 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
|
6750 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2392 | 6751 ++s->mb_y; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
6752 if(FIELD_OR_MBAFF_PICTURE) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6753 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6754 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6755 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6756 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6757 if( eos || s->mb_y >= s->mb_height ) { |
4600 | 6758 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
|
6759 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
|
6760 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
|
6761 } |
1168 | 6762 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6763 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6764 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6765 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6766 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
|
6767 |
2163 | 6768 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
|
6769 |
3316 | 6770 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
|
6771 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
|
6772 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
|
6773 |
2163 | 6774 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
|
6775 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
|
6776 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6777 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6778 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
|
6779 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
|
6780 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
|
6781 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6782 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
|
6783 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6784 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6785 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
|
6786 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
|
6787 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
|
6788 ++s->mb_y; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
6789 if(FIELD_OR_MBAFF_PICTURE) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6790 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6791 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6792 if(s->mb_y >= s->mb_height){ |
4600 | 6793 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
|
6794 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6795 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
|
6796 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
|
6797 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6798 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
|
6799 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6800 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
|
6801 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6802 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
|
6803 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6804 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6805 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6806 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6807 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
4600 | 6808 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
|
6809 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 6810 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); |
6811 | |
6812 return 0; | |
6813 }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
|
6814 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 | 6815 |
6816 return -1; | |
6817 } | |
6818 } | |
6819 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6820 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6821 |
1168 | 6822 #if 0 |
6823 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
6824 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
6825 int ret= decode_mb(h); | |
2967 | 6826 |
1168 | 6827 hl_decode_mb(h); |
6828 | |
6829 if(ret<0){ | |
3177 | 6830 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
1168 | 6831 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); |
6832 | |
6833 return -1; | |
6834 } | |
2967 | 6835 |
1168 | 6836 if(++s->mb_x >= s->mb_width){ |
6837 s->mb_x=0; | |
6838 if(++s->mb_y >= s->mb_height){ | |
6839 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
6840 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); | |
6841 | |
6842 return 0; | |
6843 }else{ | |
6844 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); | |
6845 | |
6846 return -1; | |
6847 } | |
6848 } | |
6849 } | |
2967 | 6850 |
1168 | 6851 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ |
6852 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
6853 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); | |
6854 | |
6855 return 0; | |
6856 }else{ | |
6857 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); | |
6858 | |
6859 return -1; | |
6860 } | |
6861 } | |
6862 } | |
6863 s->mb_x=0; | |
6864 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
6865 } | |
6866 #endif | |
6867 return -1; //not reached | |
6868 } | |
6869 | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6870 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
|
6871 MpegEncContext * const s = &h->s; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6872 uint8_t user_data[16+256]; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6873 int e, build, i; |
2967 | 6874 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6875 if(size<16) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6876 return -1; |
2967 | 6877 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6878 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
|
6879 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
|
6880 } |
2967 | 6881 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6882 user_data[i]= 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6883 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
|
6884 if(e==1 && build>=0) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6885 h->x264_build= build; |
2967 | 6886 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6887 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
|
6888 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
|
6889 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6890 for(; i<size; i++) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6891 skip_bits(&s->gb, 8); |
2967 | 6892 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6893 return 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6894 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6895 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6896 static int decode_sei(H264Context *h){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6897 MpegEncContext * const s = &h->s; |
2967 | 6898 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6899 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
|
6900 int size, type; |
2967 | 6901 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6902 type=0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6903 do{ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6904 type+= show_bits(&s->gb, 8); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6905 }while(get_bits(&s->gb, 8) == 255); |
2967 | 6906 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6907 size=0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6908 do{ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6909 size+= show_bits(&s->gb, 8); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6910 }while(get_bits(&s->gb, 8) == 255); |
2967 | 6911 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6912 switch(type){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6913 case 5: |
3318 | 6914 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
|
6915 return -1; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6916 break; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6917 default: |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6918 skip_bits(&s->gb, 8*size); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6919 } |
2967 | 6920 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6921 //FIXME check bits here |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6922 align_get_bits(&s->gb); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6923 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6924 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6925 return 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6926 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
6927 |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6928 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
|
6929 MpegEncContext * const s = &h->s; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6930 int cpb_count, i; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6931 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
|
6932 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
|
6933 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
|
6934 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
|
6935 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
|
6936 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
|
6937 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
|
6938 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6939 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
|
6940 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
|
6941 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
|
6942 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
|
6943 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6944 |
1168 | 6945 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
6946 MpegEncContext * const s = &h->s; | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6947 int aspect_ratio_info_present_flag; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
6948 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
|
6949 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
1168 | 6950 |
6951 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
2967 | 6952 |
1168 | 6953 if( aspect_ratio_info_present_flag ) { |
6954 aspect_ratio_idc= get_bits(&s->gb, 8); | |
6955 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
1548 | 6956 sps->sar.num= get_bits(&s->gb, 16); |
6957 sps->sar.den= get_bits(&s->gb, 16); | |
6429 | 6958 }else if(aspect_ratio_idc < sizeof(pixel_aspect)/sizeof(*pixel_aspect)){ |
1548 | 6959 sps->sar= pixel_aspect[aspect_ratio_idc]; |
1168 | 6960 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6961 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
1168 | 6962 return -1; |
6963 } | |
6964 }else{ | |
2967 | 6965 sps->sar.num= |
1548 | 6966 sps->sar.den= 0; |
1168 | 6967 } |
6968 // 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
|
6969 |
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
|
6970 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
|
6971 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
|
6972 } |
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
|
6973 |
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
|
6974 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
|
6975 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
|
6976 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
|
6977 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
|
6978 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
|
6979 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
|
6980 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
|
6981 } |
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
|
6982 } |
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
|
6983 |
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
|
6984 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
|
6985 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
|
6986 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
|
6987 } |
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
|
6988 |
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
|
6989 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
|
6990 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
|
6991 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
|
6992 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
|
6993 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
|
6994 } |
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
|
6995 |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6996 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
|
6997 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
|
6998 decode_hrd_parameters(h, sps); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6999 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
|
7000 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
|
7001 decode_hrd_parameters(h, sps); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7002 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
|
7003 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
|
7004 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
|
7005 |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7006 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
|
7007 if(sps->bitstream_restriction_flag){ |
4389 | 7008 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
|
7009 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
|
7010 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
|
7011 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
|
7012 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
|
7013 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */ |
4389 | 7014 num_reorder_frames= get_ue_golomb(&s->gb); |
7015 get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/ | |
7016 | |
7017 if(num_reorder_frames > 16 /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){ | |
7018 av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", num_reorder_frames); | |
7019 return -1; | |
7020 } | |
7021 | |
7022 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
|
7023 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7024 |
1168 | 7025 return 0; |
7026 } | |
7027 | |
3004 | 7028 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, |
7029 const uint8_t *jvt_list, const uint8_t *fallback_list){ | |
2919 | 7030 MpegEncContext * const s = &h->s; |
7031 int i, last = 8, next = 8; | |
7032 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; | |
3004 | 7033 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ |
7034 memcpy(factors, fallback_list, size*sizeof(uint8_t)); | |
2919 | 7035 else |
7036 for(i=0;i<size;i++){ | |
7037 if(next) | |
7038 next = (last + get_se_golomb(&s->gb)) & 0xff; | |
3004 | 7039 if(!i && !next){ /* matrix not written, we use the preset one */ |
7040 memcpy(factors, jvt_list, size*sizeof(uint8_t)); | |
2919 | 7041 break; |
7042 } | |
7043 last = factors[scan[i]] = next ? next : last; | |
7044 } | |
7045 } | |
7046 | |
7047 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps, | |
7048 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){ | |
7049 MpegEncContext * const s = &h->s; | |
7050 int fallback_sps = !is_sps && sps->scaling_matrix_present; | |
7051 const uint8_t *fallback[4] = { | |
7052 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0], | |
7053 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1], | |
7054 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0], | |
7055 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1] | |
7056 }; | |
7057 if(get_bits1(&s->gb)){ | |
7058 sps->scaling_matrix_present |= is_sps; | |
3004 | 7059 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y |
7060 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr | |
7061 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb | |
7062 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y | |
7063 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr | |
7064 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb | |
2919 | 7065 if(is_sps || pps->transform_8x8_mode){ |
3004 | 7066 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y |
7067 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y | |
2919 | 7068 } |
7069 } else if(fallback_sps) { | |
7070 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t)); | |
7071 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t)); | |
7072 } | |
7073 } | |
7074 | |
5079 | 7075 /** |
7076 * Returns and optionally allocates SPS / PPS structures in the supplied array 'vec' | |
7077 */ | |
7078 static void * | |
7079 alloc_parameter_set(H264Context *h, void **vec, const unsigned int id, const unsigned int max, | |
7080 const size_t size, const char *name) | |
7081 { | |
7082 if(id>=max) { | |
7083 av_log(h->s.avctx, AV_LOG_ERROR, "%s_id (%d) out of range\n", name, id); | |
7084 return NULL; | |
7085 } | |
7086 | |
7087 if(!vec[id]) { | |
7088 vec[id] = av_mallocz(size); | |
7089 if(vec[id] == NULL) | |
7090 av_log(h->s.avctx, AV_LOG_ERROR, "cannot allocate memory for %s\n", name); | |
7091 } | |
7092 return vec[id]; | |
7093 } | |
7094 | |
1168 | 7095 static inline int decode_seq_parameter_set(H264Context *h){ |
7096 MpegEncContext * const s = &h->s; | |
1371 | 7097 int profile_idc, level_idc; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7098 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
|
7099 int i; |
1168 | 7100 SPS *sps; |
2967 | 7101 |
1168 | 7102 profile_idc= get_bits(&s->gb, 8); |
1371 | 7103 get_bits1(&s->gb); //constraint_set0_flag |
7104 get_bits1(&s->gb); //constraint_set1_flag | |
7105 get_bits1(&s->gb); //constraint_set2_flag | |
2312 | 7106 get_bits1(&s->gb); //constraint_set3_flag |
7107 get_bits(&s->gb, 4); // reserved | |
1168 | 7108 level_idc= get_bits(&s->gb, 8); |
7109 sps_id= get_ue_golomb(&s->gb); | |
2967 | 7110 |
5079 | 7111 sps = alloc_parameter_set(h, (void **)h->sps_buffers, sps_id, MAX_SPS_COUNT, sizeof(SPS), "sps"); |
7112 if(sps == NULL) | |
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7113 return -1; |
5079 | 7114 |
1168 | 7115 sps->profile_idc= profile_idc; |
7116 sps->level_idc= level_idc; | |
2312 | 7117 |
2755 | 7118 if(sps->profile_idc >= 100){ //high profile |
7407 | 7119 sps->chroma_format_idc= get_ue_golomb(&s->gb); |
7120 if(sps->chroma_format_idc == 3) | |
2755 | 7121 get_bits1(&s->gb); //residual_color_transform_flag |
7122 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
7123 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
2763 | 7124 sps->transform_bypass = get_bits1(&s->gb); |
2919 | 7125 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8); |
7407 | 7126 }else{ |
2919 | 7127 sps->scaling_matrix_present = 0; |
7407 | 7128 sps->chroma_format_idc= 1; |
7129 } | |
2755 | 7130 |
1168 | 7131 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
7132 sps->poc_type= get_ue_golomb(&s->gb); | |
2967 | 7133 |
1168 | 7134 if(sps->poc_type == 0){ //FIXME #define |
7135 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
7136 } else if(sps->poc_type == 1){//FIXME #define | |
7137 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
7138 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
7139 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
|
7140 tmp= get_ue_golomb(&s->gb); |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7141 |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7142 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
|
7143 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
|
7144 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7145 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7146 sps->poc_cycle_length= tmp; |
2967 | 7147 |
1168 | 7148 for(i=0; i<sps->poc_cycle_length; i++) |
7149 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
|
7150 }else if(sps->poc_type != 2){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7151 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
1168 | 7152 return -1; |
7153 } | |
7154 | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7155 tmp= get_ue_golomb(&s->gb); |
6017
e1404acccac3
Actually return with an error condition if we're being asked to deal with too
heydowns
parents:
6016
diff
changeset
|
7156 if(tmp > MAX_PICTURE_COUNT-2 || tmp >= 32){ |
2254
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
7157 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n"); |
6017
e1404acccac3
Actually return with an error condition if we're being asked to deal with too
heydowns
parents:
6016
diff
changeset
|
7158 return -1; |
2254
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
7159 } |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7160 sps->ref_frame_count= tmp; |
1371 | 7161 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
|
7162 mb_width= get_ue_golomb(&s->gb) + 1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7163 mb_height= get_ue_golomb(&s->gb) + 1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7164 if(mb_width >= INT_MAX/16 || mb_height >= INT_MAX/16 || |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7165 avcodec_check_dimensions(NULL, 16*mb_width, 16*mb_height)){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7166 av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n"); |
2422 | 7167 return -1; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7168 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7169 sps->mb_width = mb_width; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7170 sps->mb_height= mb_height; |
2422 | 7171 |
1168 | 7172 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
7173 if(!sps->frame_mbs_only_flag) | |
7174 sps->mb_aff= get_bits1(&s->gb); | |
7175 else | |
7176 sps->mb_aff= 0; | |
7177 | |
7178 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
7179 | |
3316 | 7180 #ifndef ALLOW_INTERLACE |
7181 if(sps->mb_aff) | |
3954 | 7182 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n"); |
3316 | 7183 #endif |
7184 if(!sps->direct_8x8_inference_flag && sps->mb_aff) | |
7185 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); | |
7186 | |
1371 | 7187 sps->crop= get_bits1(&s->gb); |
7188 if(sps->crop){ | |
7189 sps->crop_left = get_ue_golomb(&s->gb); | |
7190 sps->crop_right = get_ue_golomb(&s->gb); | |
7191 sps->crop_top = get_ue_golomb(&s->gb); | |
7192 sps->crop_bottom= get_ue_golomb(&s->gb); | |
7193 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
|
7194 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
1371 | 7195 } |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
7196 if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !h->sps.frame_mbs_only_flag)){ |
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
7197 av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n"); |
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
7198 } |
1371 | 7199 }else{ |
2967 | 7200 sps->crop_left = |
7201 sps->crop_right = | |
7202 sps->crop_top = | |
1371 | 7203 sps->crop_bottom= 0; |
7204 } | |
7205 | |
1168 | 7206 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
7207 if( sps->vui_parameters_present_flag ) | |
7208 decode_vui_parameters(h, sps); | |
2967 | 7209 |
1168 | 7210 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
7407 | 7211 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 %s\n", |
1168 | 7212 sps_id, sps->profile_idc, sps->level_idc, |
7213 sps->poc_type, | |
7214 sps->ref_frame_count, | |
7215 sps->mb_width, sps->mb_height, | |
7216 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
7217 sps->direct_8x8_inference_flag ? "8B8" : "", | |
2967 | 7218 sps->crop_left, sps->crop_right, |
7219 sps->crop_top, sps->crop_bottom, | |
7407 | 7220 sps->vui_parameters_present_flag ? "VUI" : "", |
7221 ((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc] | |
1168 | 7222 ); |
7223 } | |
7224 return 0; | |
7225 } | |
7226 | |
5226
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7227 static void |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7228 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
|
7229 { |
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7230 int i; |
7347
612a78c3b128
qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents:
7346
diff
changeset
|
7231 for(i = 0; i < 52; i++) |
612a78c3b128
qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents:
7346
diff
changeset
|
7232 pps->chroma_qp_table[t][i] = 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
|
7233 } |
65bffcc5571a
Precompute a chroma_qp table with index offset for each pps,
gpoirier
parents:
5225
diff
changeset
|
7234 |
2755 | 7235 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
1168 | 7236 MpegEncContext * const s = &h->s; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7237 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
|
7238 PPS *pps; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7239 |
5079 | 7240 pps = alloc_parameter_set(h, (void **)h->pps_buffers, pps_id, MAX_PPS_COUNT, sizeof(PPS), "pps"); |
7241 if(pps == NULL) | |
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7242 return -1; |
2967 | 7243 |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7244 tmp= get_ue_golomb(&s->gb); |
5079 | 7245 if(tmp>=MAX_SPS_COUNT || h->sps_buffers[tmp] == NULL){ |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7246 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
|
7247 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7248 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7249 pps->sps_id= tmp; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
7250 |
1168 | 7251 pps->cabac= get_bits1(&s->gb); |
7252 pps->pic_order_present= get_bits1(&s->gb); | |
7253 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
7254 if(pps->slice_group_count > 1 ){ | |
7255 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
|
7256 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
1168 | 7257 switch(pps->mb_slice_group_map_type){ |
7258 case 0: | |
7259 #if 0 | |
7260 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
7261 | run_length[ i ] |1 |ue(v) | | |
7262 #endif | |
7263 break; | |
7264 case 2: | |
7265 #if 0 | |
7266 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
7267 |{ | | | | |
7268 | top_left_mb[ i ] |1 |ue(v) | | |
7269 | bottom_right_mb[ i ] |1 |ue(v) | | |
7270 | } | | | | |
7271 #endif | |
7272 break; | |
7273 case 3: | |
7274 case 4: | |
7275 case 5: | |
7276 #if 0 | |
7277 | slice_group_change_direction_flag |1 |u(1) | | |
7278 | slice_group_change_rate_minus1 |1 |ue(v) | | |
7279 #endif | |
7280 break; | |
7281 case 6: | |
7282 #if 0 | |
7283 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
7284 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
7285 |) | | | | |
7286 | slice_group_id[ i ] |1 |u(v) | | |
7287 #endif | |
1214 | 7288 break; |
1168 | 7289 } |
7290 } | |
7291 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
7292 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
4531 | 7293 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
|
7294 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
|
7295 pps->ref_count[0]= pps->ref_count[1]= 1; |
1168 | 7296 return -1; |
7297 } | |
2967 | 7298 |
1168 | 7299 pps->weighted_pred= get_bits1(&s->gb); |
7300 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
7301 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
7302 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
|
7303 pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb); |
1168 | 7304 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); |
7305 pps->constrained_intra_pred= get_bits1(&s->gb); | |
7306 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
2967 | 7307 |
3291
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7308 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
|
7309 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit |
2919 | 7310 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t)); |
7311 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
2755 | 7312 |
7313 if(get_bits_count(&s->gb) < bit_length){ | |
7314 pps->transform_8x8_mode= get_bits1(&s->gb); | |
5079 | 7315 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
|
7316 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
|
7317 } else { |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7318 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
|
7319 } |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7320 |
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7321 build_qp_table(pps, 0, pps->chroma_qp_index_offset[0]); |
7345 | 7322 build_qp_table(pps, 1, pps->chroma_qp_index_offset[1]); |
7323 if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1]) | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7324 h->pps.chroma_qp_diff= 1; |
2967 | 7325 |
1168 | 7326 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
|
7327 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 | 7328 pps_id, pps->sps_id, |
7329 pps->cabac ? "CABAC" : "CAVLC", | |
7330 pps->slice_group_count, | |
7331 pps->ref_count[0], pps->ref_count[1], | |
7332 pps->weighted_pred ? "weighted" : "", | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
7333 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset[0], pps->chroma_qp_index_offset[1], |
1168 | 7334 pps->deblocking_filter_parameters_present ? "LPAR" : "", |
7335 pps->constrained_intra_pred ? "CONSTR" : "", | |
2755 | 7336 pps->redundant_pic_cnt_present ? "REDU" : "", |
7337 pps->transform_8x8_mode ? "8x8DCT" : "" | |
1168 | 7338 ); |
7339 } | |
2967 | 7340 |
1168 | 7341 return 0; |
7342 } | |
7343 | |
5642 | 7344 /** |
7345 * Call decode_slice() for each context. | |
7346 * | |
7347 * @param h h264 master context | |
7348 * @param context_count number of contexts to execute | |
7349 */ | |
7350 static void execute_decode_slices(H264Context *h, int context_count){ | |
7351 MpegEncContext * const s = &h->s; | |
7352 AVCodecContext * const avctx= s->avctx; | |
7353 H264Context *hx; | |
7354 int i; | |
7355 | |
7356 if(context_count == 1) { | |
7357 decode_slice(avctx, h); | |
7358 } else { | |
7359 for(i = 1; i < context_count; i++) { | |
7360 hx = h->thread_context[i]; | |
7361 hx->s.error_resilience = avctx->error_resilience; | |
7362 hx->s.error_count = 0; | |
7363 } | |
7364 | |
7365 avctx->execute(avctx, (void *)decode_slice, | |
7366 (void **)h->thread_context, NULL, context_count); | |
7367 | |
7368 /* pull back stuff from slices to master context */ | |
7369 hx = h->thread_context[context_count - 1]; | |
7370 s->mb_x = hx->s.mb_x; | |
7371 s->mb_y = hx->s.mb_y; | |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7372 s->dropable = hx->s.dropable; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7373 s->picture_structure = hx->s.picture_structure; |
5642 | 7374 for(i = 1; i < context_count; i++) |
7375 h->s.error_count += h->thread_context[i]->s.error_count; | |
7376 } | |
7377 } | |
7378 | |
7379 | |
6216 | 7380 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ |
1168 | 7381 MpegEncContext * const s = &h->s; |
7382 AVCodecContext * const avctx= s->avctx; | |
7383 int buf_index=0; | |
5642 | 7384 H264Context *hx; ///< thread context |
7385 int context_count = 0; | |
7386 | |
7387 h->max_contexts = avctx->thread_count; | |
1322 | 7388 #if 0 |
1168 | 7389 int i; |
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7390 for(i=0; i<50; i++){ |
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7391 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]); |
1168 | 7392 } |
7393 #endif | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7394 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){ |
5642 | 7395 h->current_slice = 0; |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7396 if (!s->first_field) |
5803 | 7397 s->current_picture_ptr= NULL; |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7398 } |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7399 |
1168 | 7400 for(;;){ |
7401 int consumed; | |
7402 int dst_length; | |
7403 int bit_length; | |
6216 | 7404 const uint8_t *ptr; |
2227 | 7405 int i, nalsize = 0; |
5642 | 7406 int err; |
2967 | 7407 |
5170 | 7408 if(h->is_avc) { |
7409 if(buf_index >= buf_size) break; | |
7410 nalsize = 0; | |
7411 for(i = 0; i < h->nal_length_size; i++) | |
7412 nalsize = (nalsize << 8) | buf[buf_index++]; | |
7413 if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ | |
7414 if(nalsize == 1){ | |
7415 buf_index++; | |
7416 continue; | |
7417 }else{ | |
7418 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); | |
7419 break; | |
7420 } | |
7421 } | |
7422 } else { | |
7423 // start code prefix search | |
7424 for(; buf_index + 3 < buf_size; buf_index++){ | |
7425 // This should always succeed in the first iteration. | |
7426 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
7427 break; | |
7428 } | |
7429 | |
7430 if(buf_index+3 >= buf_size) break; | |
7431 | |
7432 buf_index+=3; | |
7433 } | |
2967 | 7434 |
5642 | 7435 hx = h->thread_context[context_count]; |
7436 | |
7437 ptr= decode_nal(hx, 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
|
7438 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
|
7439 return -1; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
7440 } |
4829
e3161603a048
Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents:
4828
diff
changeset
|
7441 while(ptr[dst_length - 1] == 0 && dst_length > 0) |
3341 | 7442 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
|
7443 bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1)); |
1168 | 7444 |
7445 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
5642 | 7446 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); |
1168 | 7447 } |
2967 | 7448 |
6490
bb799e3bc64b
If consumed does not match nalsize, favor nalsize.
michael
parents:
6488
diff
changeset
|
7449 if (h->is_avc && (nalsize != consumed)){ |
2227 | 7450 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); |
6490
bb799e3bc64b
If consumed does not match nalsize, favor nalsize.
michael
parents:
6488
diff
changeset
|
7451 consumed= nalsize; |
bb799e3bc64b
If consumed does not match nalsize, favor nalsize.
michael
parents:
6488
diff
changeset
|
7452 } |
2227 | 7453 |
1168 | 7454 buf_index += consumed; |
7455 | |
5127 | 7456 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME do not discard SEI id |
2792 | 7457 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
1168 | 7458 continue; |
2967 | 7459 |
5642 | 7460 again: |
7461 err = 0; | |
7462 switch(hx->nal_unit_type){ | |
1168 | 7463 case NAL_IDR_SLICE: |
5642 | 7464 if (h->nal_unit_type != NAL_IDR_SLICE) { |
7465 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices"); | |
7466 return -1; | |
7467 } | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7468 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
1168 | 7469 case NAL_SLICE: |
5642 | 7470 init_get_bits(&hx->s.gb, ptr, bit_length); |
7471 hx->intra_gb_ptr= | |
7472 hx->inter_gb_ptr= &hx->s.gb; | |
7473 hx->s.data_partitioning = 0; | |
7474 | |
7475 if((err = decode_slice_header(hx, h))) | |
7476 break; | |
7477 | |
5773
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
7478 s->current_picture_ptr->key_frame|= (hx->nal_unit_type == NAL_IDR_SLICE); |
5642 | 7479 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5 |
7480 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
7481 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) |
7340 | 7482 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) |
2793 | 7483 && avctx->skip_frame < AVDISCARD_ALL) |
5642 | 7484 context_count++; |
1168 | 7485 break; |
7486 case NAL_DPA: | |
5642 | 7487 init_get_bits(&hx->s.gb, ptr, bit_length); |
7488 hx->intra_gb_ptr= | |
7489 hx->inter_gb_ptr= NULL; | |
7490 hx->s.data_partitioning = 1; | |
7491 | |
7492 err = decode_slice_header(hx, h); | |
1168 | 7493 break; |
7494 case NAL_DPB: | |
5642 | 7495 init_get_bits(&hx->intra_gb, ptr, bit_length); |
7496 hx->intra_gb_ptr= &hx->intra_gb; | |
1168 | 7497 break; |
7498 case NAL_DPC: | |
5642 | 7499 init_get_bits(&hx->inter_gb, ptr, bit_length); |
7500 hx->inter_gb_ptr= &hx->inter_gb; | |
7501 | |
7502 if(hx->redundant_pic_count==0 && hx->intra_gb_ptr && hx->s.data_partitioning | |
4354
d18568fb0187
Avoid calling decode_slice when context_initialized is not set.
reimar
parents:
4344
diff
changeset
|
7503 && s->context_initialized |
2793 | 7504 && s->hurry_up < 5 |
5642 | 7505 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
7506 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) |
7340 | 7507 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) |
2793 | 7508 && avctx->skip_frame < AVDISCARD_ALL) |
5642 | 7509 context_count++; |
1168 | 7510 break; |
7511 case NAL_SEI: | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7512 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
|
7513 decode_sei(h); |
1168 | 7514 break; |
7515 case NAL_SPS: | |
7516 init_get_bits(&s->gb, ptr, bit_length); | |
7517 decode_seq_parameter_set(h); | |
2967 | 7518 |
1168 | 7519 if(s->flags& CODEC_FLAG_LOW_DELAY) |
7520 s->low_delay=1; | |
2967 | 7521 |
2538 | 7522 if(avctx->has_b_frames < 2) |
7523 avctx->has_b_frames= !s->low_delay; | |
1168 | 7524 break; |
7525 case NAL_PPS: | |
7526 init_get_bits(&s->gb, ptr, bit_length); | |
2967 | 7527 |
2755 | 7528 decode_picture_parameter_set(h, bit_length); |
1168 | 7529 |
7530 break; | |
2960 | 7531 case NAL_AUD: |
7532 case NAL_END_SEQUENCE: | |
7533 case NAL_END_STREAM: | |
7534 case NAL_FILLER_DATA: | |
7535 case NAL_SPS_EXT: | |
7536 case NAL_AUXILIARY_SLICE: | |
1168 | 7537 break; |
2979 | 7538 default: |
5631 | 7539 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", h->nal_unit_type, bit_length); |
2967 | 7540 } |
5642 | 7541 |
7542 if(context_count == h->max_contexts) { | |
7543 execute_decode_slices(h, context_count); | |
7544 context_count = 0; | |
7545 } | |
7546 | |
7547 if (err < 0) | |
7548 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
7549 else if(err == 1) { | |
7550 /* Slice could not be decoded in parallel mode, copy down | |
7551 * NAL unit stuff to context 0 and restart. Note that | |
7374 | 7552 * rbsp_buffer is not transferred, but since we no longer |
5642 | 7553 * run in parallel mode this should not be an issue. */ |
7554 h->nal_unit_type = hx->nal_unit_type; | |
7555 h->nal_ref_idc = hx->nal_ref_idc; | |
7556 hx = h; | |
7557 goto again; | |
7558 } | |
7559 } | |
7560 if(context_count) | |
7561 execute_decode_slices(h, context_count); | |
1168 | 7562 return buf_index; |
7563 } | |
7564 | |
7565 /** | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7566 * returns the number of bytes consumed for building the current frame |
1168 | 7567 */ |
7568 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
5127 | 7569 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
1168 | 7570 if(pos+10>buf_size) pos=buf_size; // oops ;) |
7571 | |
7572 return pos; | |
7573 } | |
7574 | |
2967 | 7575 static int decode_frame(AVCodecContext *avctx, |
1168 | 7576 void *data, int *data_size, |
6216 | 7577 const uint8_t *buf, int buf_size) |
1168 | 7578 { |
7579 H264Context *h = avctx->priv_data; | |
7580 MpegEncContext *s = &h->s; | |
2967 | 7581 AVFrame *pict = data; |
1168 | 7582 int buf_index; |
2967 | 7583 |
1168 | 7584 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
7585 s->flags2= avctx->flags2; |
1168 | 7586 |
7374 | 7587 /* end of stream, output what is still in the buffers */ |
1168 | 7588 if (buf_size == 0) { |
4556 | 7589 Picture *out; |
7590 int i, out_idx; | |
7591 | |
7592 //FIXME factorize this with the output code below | |
7593 out = h->delayed_pic[0]; | |
7594 out_idx = 0; | |
7356 | 7595 for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++) |
4556 | 7596 if(h->delayed_pic[i]->poc < out->poc){ |
7597 out = h->delayed_pic[i]; | |
7598 out_idx = i; | |
7599 } | |
7600 | |
7601 for(i=out_idx; h->delayed_pic[i]; i++) | |
7602 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
7603 | |
7604 if(out){ | |
7605 *data_size = sizeof(AVFrame); | |
7606 *pict= *(AVFrame*)out; | |
7607 } | |
7608 | |
1168 | 7609 return 0; |
7610 } | |
2967 | 7611 |
2227 | 7612 if(h->is_avc && !h->got_avcC) { |
7613 int i, cnt, nalsize; | |
7614 unsigned char *p = avctx->extradata; | |
7615 if(avctx->extradata_size < 7) { | |
7616 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
7617 return -1; | |
7618 } | |
7619 if(*p != 1) { | |
7620 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
7621 return -1; | |
7622 } | |
7623 /* sps and pps in the avcC always have length coded with 2 bytes, | |
7624 so put a fake nal_length_size = 2 while parsing them */ | |
7625 h->nal_length_size = 2; | |
7626 // Decode sps from avcC | |
7627 cnt = *(p+5) & 0x1f; // Number of sps | |
7628 p += 6; | |
7629 for (i = 0; i < cnt; i++) { | |
4364 | 7630 nalsize = AV_RB16(p) + 2; |
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7631 if(decode_nal_units(h, p, nalsize) < 0) { |
2227 | 7632 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
7633 return -1; | |
7634 } | |
7635 p += nalsize; | |
2967 | 7636 } |
2227 | 7637 // Decode pps from avcC |
7638 cnt = *(p++); // Number of pps | |
7639 for (i = 0; i < cnt; i++) { | |
4364 | 7640 nalsize = AV_RB16(p) + 2; |
2227 | 7641 if(decode_nal_units(h, p, nalsize) != nalsize) { |
7642 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
7643 return -1; | |
7644 } | |
7645 p += nalsize; | |
2967 | 7646 } |
2227 | 7647 // Now store right nal length size, that will be use to parse all other nals |
7648 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
7649 // Do not reparse avcC | |
7650 h->got_avcC = 1; | |
7651 } | |
7652 | |
4507
b80c704183e9
always decode extradata when of non-avc stream (like RTSP)
gpoirier
parents:
4391
diff
changeset
|
7653 if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){ |
2967 | 7654 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) |
1168 | 7655 return -1; |
7656 } | |
7657 | |
7658 buf_index=decode_nal_units(h, buf, buf_size); | |
2967 | 7659 if(buf_index < 0) |
1168 | 7660 return -1; |
7661 | |
4620 | 7662 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ |
5629
7e5ebda833e9
Remove error raising when explicitely skipping frame
benoit
parents:
5547
diff
changeset
|
7663 if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; |
4620 | 7664 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); |
7665 return -1; | |
7666 } | |
7667 | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7668 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
|
7669 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
|
7670 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
|
7671 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
|
7672 |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7673 s->mb_y= 0; |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7674 |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7675 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
|
7676 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
|
7677 |
7350 | 7678 if(!s->dropable) { |
7679 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
7680 h->prev_poc_msb= h->poc_msb; | |
7681 h->prev_poc_lsb= h->poc_lsb; | |
7682 } | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7683 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
|
7684 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
|
7685 |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7686 /* |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7687 * FIXME: Error handling code does not seem to support interlaced |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7688 * when slices span multiple rows |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7689 * The ff_er_add_slice calls don't work right for bottom |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7690 * fields; they cause massive erroneous error concealing |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7691 * Error marking covers both fields (top and bottom). |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7692 * This causes a mismatched s->error_count |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7693 * and a bad error table. Further, the error count goes to |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7694 * INT_MAX when called for bottom field, because mb_y is |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7695 * past end by one (callers fault) and resync_mb_y != 0 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7696 * causes problems for the first MB line, too. |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7697 */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7698 if (!FIELD_PICTURE) |
5803 | 7699 ff_er_frame_end(s); |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7700 |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7701 MPV_frame_end(s); |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
7702 |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
7703 if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) { |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7704 /* Wait for second field. */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7705 *data_size = 0; |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7706 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7707 } else { |
5876
731ee5ad6bde
Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents:
5825
diff
changeset
|
7708 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE; |
5904 | 7709 /* Derive top_field_first from field pocs. */ |
7710 cur->top_field_first = cur->field_poc[0] < cur->field_poc[1]; | |
5876
731ee5ad6bde
Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents:
5825
diff
changeset
|
7711 |
5803 | 7712 //FIXME do something with unavailable reference frames |
2967 | 7713 |
5803 | 7714 /* Sort B-frames into display order */ |
7715 | |
7716 if(h->sps.bitstream_restriction_flag | |
7717 && s->avctx->has_b_frames < h->sps.num_reorder_frames){ | |
7718 s->avctx->has_b_frames = h->sps.num_reorder_frames; | |
7719 s->low_delay = 0; | |
7720 } | |
7721 | |
7325
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7722 if( s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7723 && !h->sps.bitstream_restriction_flag){ |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7724 s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT; |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7725 s->low_delay= 0; |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7726 } |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
7727 |
5803 | 7728 pics = 0; |
7729 while(h->delayed_pic[pics]) pics++; | |
7730 | |
7283
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7277
diff
changeset
|
7731 assert(pics <= MAX_DELAYED_PIC_COUNT); |
5803 | 7732 |
7733 h->delayed_pic[pics++] = cur; | |
7734 if(cur->reference == 0) | |
7735 cur->reference = DELAYED_PIC_REF; | |
7736 | |
7737 out = h->delayed_pic[0]; | |
7738 out_idx = 0; | |
7356 | 7739 for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++) |
5803 | 7740 if(h->delayed_pic[i]->poc < out->poc){ |
7741 out = h->delayed_pic[i]; | |
7742 out_idx = i; | |
7743 } | |
7360 | 7744 cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i]; |
5803 | 7745 |
7310
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
7746 out_of_order = !cross_idr && out->poc < h->outputed_poc; |
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
7747 |
5803 | 7748 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
7749 { } | |
7320
927ac918cddb
Make the automatic has_b_frames increasing code increase it up to the
michael
parents:
7318
diff
changeset
|
7750 else if((out_of_order && pics-1 == s->avctx->has_b_frames && s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) |
5803 | 7751 || (s->low_delay && |
7317 | 7752 ((!cross_idr && out->poc > h->outputed_poc + 2) |
6481 | 7753 || cur->pict_type == FF_B_TYPE))) |
5803 | 7754 { |
7755 s->low_delay = 0; | |
7756 s->avctx->has_b_frames++; | |
7312 | 7757 } |
7758 | |
7316 | 7759 if(out_of_order || pics > s->avctx->has_b_frames){ |
7314
def12c3c7742
Do not forget marking disposed delayed pics as unused.
michael
parents:
7313
diff
changeset
|
7760 out->reference &= ~DELAYED_PIC_REF; |
5803 | 7761 for(i=out_idx; h->delayed_pic[i]; i++) |
7762 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
7763 } | |
7316 | 7764 if(!out_of_order && pics > s->avctx->has_b_frames){ |
5803 | 7765 *data_size = sizeof(AVFrame); |
7310
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
7766 |
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
7767 h->outputed_poc = out->poc; |
5803 | 7768 *pict= *(AVFrame*)out; |
7316 | 7769 }else{ |
5803 | 7770 av_log(avctx, AV_LOG_DEBUG, "no picture\n"); |
7316 | 7771 } |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
7772 } |
2937 | 7773 } |
7774 | |
7775 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
|
7776 ff_print_debug_info(s, pict); |
1168 | 7777 //printf("out %d\n", (int)pict->data[0]); |
7778 #if 0 //? | |
7779 | |
7780 /* Return the Picture timestamp as the frame number */ | |
5963 | 7781 /* we subtract 1 because it is added on utils.c */ |
1168 | 7782 avctx->frame_number = s->picture_number - 1; |
7783 #endif | |
7784 return get_consumed_bytes(s, buf_index, buf_size); | |
7785 } | |
7786 #if 0 | |
7787 static inline void fill_mb_avail(H264Context *h){ | |
7788 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
|
7789 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 7790 |
7791 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
|
7792 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
|
7793 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
|
7794 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 7795 }else{ |
7796 h->mb_avail[0]= | |
7797 h->mb_avail[1]= | |
7798 h->mb_avail[2]= 0; | |
7799 } | |
7800 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
7801 h->mb_avail[4]= 1; //FIXME move out | |
7802 h->mb_avail[5]= 0; //FIXME move out | |
7803 } | |
7804 #endif | |
7805 | |
6164
ecaf5226e9b0
Consistently use TEST as the preprocessor condition to enable test code.
diego
parents:
6046
diff
changeset
|
7806 #ifdef TEST |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
7807 #undef printf |
5380
389366aa3458
Fix the self tests which are contained in some codecs and are using random().
takis
parents:
5338
diff
changeset
|
7808 #undef random |
1168 | 7809 #define COUNT 8000 |
7810 #define SIZE (COUNT*40) | |
5934 | 7811 int main(void){ |
1168 | 7812 int i; |
7813 uint8_t temp[SIZE]; | |
7814 PutBitContext pb; | |
7815 GetBitContext gb; | |
7816 // int int_temp[10000]; | |
7817 DSPContext dsp; | |
7818 AVCodecContext avctx; | |
2967 | 7819 |
1168 | 7820 dsputil_init(&dsp, &avctx); |
7821 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
7822 init_put_bits(&pb, temp, SIZE); |
1168 | 7823 printf("testing unsigned exp golomb\n"); |
7824 for(i=0; i<COUNT; i++){ | |
7825 START_TIMER | |
7826 set_ue_golomb(&pb, i); | |
7827 STOP_TIMER("set_ue_golomb"); | |
7828 } | |
7829 flush_put_bits(&pb); | |
2967 | 7830 |
1168 | 7831 init_get_bits(&gb, temp, 8*SIZE); |
7832 for(i=0; i<COUNT; i++){ | |
7833 int j, s; | |
2967 | 7834 |
1168 | 7835 s= show_bits(&gb, 24); |
2967 | 7836 |
1168 | 7837 START_TIMER |
7838 j= get_ue_golomb(&gb); | |
7839 if(j != i){ | |
5127 | 7840 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
1168 | 7841 // return -1; |
7842 } | |
7843 STOP_TIMER("get_ue_golomb"); | |
7844 } | |
2967 | 7845 |
7846 | |
1524 | 7847 init_put_bits(&pb, temp, SIZE); |
1168 | 7848 printf("testing signed exp golomb\n"); |
7849 for(i=0; i<COUNT; i++){ | |
7850 START_TIMER | |
7851 set_se_golomb(&pb, i - COUNT/2); | |
7852 STOP_TIMER("set_se_golomb"); | |
7853 } | |
7854 flush_put_bits(&pb); | |
2967 | 7855 |
1168 | 7856 init_get_bits(&gb, temp, 8*SIZE); |
7857 for(i=0; i<COUNT; i++){ | |
7858 int j, s; | |
2967 | 7859 |
1168 | 7860 s= show_bits(&gb, 24); |
2967 | 7861 |
1168 | 7862 START_TIMER |
7863 j= get_se_golomb(&gb); | |
7864 if(j != i - COUNT/2){ | |
5127 | 7865 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
1168 | 7866 // return -1; |
7867 } | |
7868 STOP_TIMER("get_se_golomb"); | |
7869 } | |
7870 | |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
7871 #if 0 |
1168 | 7872 printf("testing 4x4 (I)DCT\n"); |
2967 | 7873 |
1168 | 7874 DCTELEM block[16]; |
7875 uint8_t src[16], ref[16]; | |
7876 uint64_t error= 0, max_error=0; | |
7877 | |
7878 for(i=0; i<COUNT; i++){ | |
7879 int j; | |
7880 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
7881 for(j=0; j<16; j++){ | |
7882 ref[j]= random()%255; | |
7883 src[j]= random()%255; | |
7884 } | |
7885 | |
7886 h264_diff_dct_c(block, src, ref, 4); | |
2967 | 7887 |
1168 | 7888 //normalize |
7889 for(j=0; j<16; j++){ | |
7890 // printf("%d ", block[j]); | |
7891 block[j]= block[j]*4; | |
7892 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
7893 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
7894 } | |
7895 // printf("\n"); | |
2967 | 7896 |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
7897 s->dsp.h264_idct_add(ref, block, 4); |
1168 | 7898 /* for(j=0; j<16; j++){ |
7899 printf("%d ", ref[j]); | |
7900 } | |
7901 printf("\n");*/ | |
2967 | 7902 |
1168 | 7903 for(j=0; j<16; j++){ |
4001 | 7904 int diff= FFABS(src[j] - ref[j]); |
2967 | 7905 |
1168 | 7906 error+= diff*diff; |
7907 max_error= FFMAX(max_error, diff); | |
7908 } | |
7909 } | |
7910 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
7911 printf("testing quantizer\n"); | |
7912 for(qp=0; qp<52; qp++){ | |
7913 for(i=0; i<16; i++) | |
7914 src1_block[i]= src2_block[i]= random()%255; | |
2967 | 7915 |
1168 | 7916 } |
7917 printf("Testing NAL layer\n"); | |
2967 | 7918 |
1168 | 7919 uint8_t bitstream[COUNT]; |
7920 uint8_t nal[COUNT*2]; | |
7921 H264Context h; | |
7922 memset(&h, 0, sizeof(H264Context)); | |
2967 | 7923 |
1168 | 7924 for(i=0; i<COUNT; i++){ |
7925 int zeros= i; | |
7926 int nal_length; | |
7927 int consumed; | |
7928 int out_length; | |
7929 uint8_t *out; | |
7930 int j; | |
2967 | 7931 |
1168 | 7932 for(j=0; j<COUNT; j++){ |
7933 bitstream[j]= (random() % 255) + 1; | |
7934 } | |
2967 | 7935 |
1168 | 7936 for(j=0; j<zeros; j++){ |
7937 int pos= random() % COUNT; | |
7938 while(bitstream[pos] == 0){ | |
7939 pos++; | |
7940 pos %= COUNT; | |
7941 } | |
7942 bitstream[pos]=0; | |
7943 } | |
2967 | 7944 |
1168 | 7945 START_TIMER |
2967 | 7946 |
1168 | 7947 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); |
7948 if(nal_length<0){ | |
7949 printf("encoding failed\n"); | |
7950 return -1; | |
7951 } | |
2967 | 7952 |
1168 | 7953 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); |
7954 | |
7955 STOP_TIMER("NAL") | |
2967 | 7956 |
1168 | 7957 if(out_length != COUNT){ |
7958 printf("incorrect length %d %d\n", out_length, COUNT); | |
7959 return -1; | |
7960 } | |
2967 | 7961 |
1168 | 7962 if(consumed != nal_length){ |
7963 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
7964 return -1; | |
7965 } | |
2967 | 7966 |
1168 | 7967 if(memcmp(bitstream, out, COUNT)){ |
5127 | 7968 printf("mismatch\n"); |
1168 | 7969 return -1; |
7970 } | |
7971 } | |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
7972 #endif |
2967 | 7973 |
1168 | 7974 printf("Testing RBSP\n"); |
2967 | 7975 |
7976 | |
1168 | 7977 return 0; |
7978 } | |
6164
ecaf5226e9b0
Consistently use TEST as the preprocessor condition to enable test code.
diego
parents:
6046
diff
changeset
|
7979 #endif /* TEST */ |
1168 | 7980 |
7981 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6490
diff
changeset
|
7982 static av_cold int decode_end(AVCodecContext *avctx) |
1168 | 7983 { |
7984 H264Context *h = avctx->priv_data; | |
7985 MpegEncContext *s = &h->s; | |
2967 | 7986 |
5174 | 7987 av_freep(&h->rbsp_buffer[0]); |
7988 av_freep(&h->rbsp_buffer[1]); | |
1168 | 7989 free_tables(h); //FIXME cleanup init stuff perhaps |
7990 MPV_common_end(s); | |
7991 | |
7992 // memset(h, 0, sizeof(H264Context)); | |
2967 | 7993 |
1168 | 7994 return 0; |
7995 } | |
7996 | |
7997 | |
7998 AVCodec h264_decoder = { | |
7999 "h264", | |
8000 CODEC_TYPE_VIDEO, | |
8001 CODEC_ID_H264, | |
8002 sizeof(H264Context), | |
8003 decode_init, | |
8004 NULL, | |
8005 decode_end, | |
8006 decode_frame, | |
7359
1980cae356ad
Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents:
7358
diff
changeset
|
8007 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY, |
2640 | 8008 .flush= flush_dpb, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6933
diff
changeset
|
8009 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), |
1168 | 8010 }; |
8011 | |
1234 | 8012 #include "svq3.c" |