Mercurial > libavcodec.hg
annotate h264.c @ 12525:7c0dbd8eb53a libavcodec
Improve error concealment of lost frames
If a frame is lost, replace it with data from the previous valid frame.
author | darkshikari |
---|---|
date | Mon, 27 Sep 2010 04:43:41 +0000 |
parents | 58a960d6e34c |
children | 63edd10ad4bc |
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 /** |
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11634
diff
changeset
|
23 * @file |
1168 | 24 * H.264 / AVC / MPEG4 part10 codec. |
25 * @author Michael Niedermayer <michaelni@gmx.at> | |
26 */ | |
27 | |
12525 | 28 #include "libavcore/imgutils.h" |
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
9004
diff
changeset
|
29 #include "internal.h" |
1168 | 30 #include "dsputil.h" |
31 #include "avcodec.h" | |
32 #include "mpegvideo.h" | |
4975 | 33 #include "h264.h" |
1168 | 34 #include "h264data.h" |
10864 | 35 #include "h264_mvpred.h" |
4975 | 36 #include "h264_parser.h" |
1168 | 37 #include "golomb.h" |
8627
d6bab465b82c
moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents:
8610
diff
changeset
|
38 #include "mathops.h" |
6020 | 39 #include "rectangle.h" |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
40 #include "vdpau_internal.h" |
1168 | 41 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
42 #include "cabac.h" |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
43 |
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3219
diff
changeset
|
44 //#undef NDEBUG |
1168 | 45 #include <assert.h> |
46 | |
7993
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
47 static const uint8_t rem6[52]={ |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
48 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
|
49 }; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
50 |
7993
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
51 static const uint8_t div6[52]={ |
4277
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
52 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
|
53 }; |
113f3b395bac
Making rem6 and div6 globally visible and thus adding prefixes.
takis
parents:
4276
diff
changeset
|
54 |
11795
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
55 static const enum PixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = { |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
56 PIX_FMT_DXVA2_VLD, |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
57 PIX_FMT_VAAPI_VLD, |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
58 PIX_FMT_YUVJ420P, |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
59 PIX_FMT_NONE |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
60 }; |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
61 |
10852 | 62 void ff_h264_write_back_intra_pred_mode(H264Context *h){ |
11285 | 63 int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy]; |
64 | |
11286
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
65 AV_COPY32(mode, h->intra4x4_pred_mode_cache + 4 + 8*4); |
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
66 mode[4]= h->intra4x4_pred_mode_cache[7+8*3]; |
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
67 mode[5]= h->intra4x4_pred_mode_cache[7+8*2]; |
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
68 mode[6]= h->intra4x4_pred_mode_cache[7+8*1]; |
1168 | 69 } |
70 | |
71 /** | |
72 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
73 */ | |
10863
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
74 int ff_h264_check_intra4x4_pred_mode(H264Context *h){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
75 MpegEncContext * const s = &h->s; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
76 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
77 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
78 int i; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
79 |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
80 if(!(h->top_samples_available&0x8000)){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
81 for(i=0; i<4; i++){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
82 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
83 if(status<0){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
84 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); |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
85 return -1; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
86 } else if(status){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
87 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
88 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
89 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
90 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
91 |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
92 if((h->left_samples_available&0x8888)!=0x8888){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
93 static const int mask[4]={0x8000,0x2000,0x80,0x20}; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
94 for(i=0; i<4; i++){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
95 if(!(h->left_samples_available&mask[i])){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
96 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
97 if(status<0){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
98 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); |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
99 return -1; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
100 } else if(status){ |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
101 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
102 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
103 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
104 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
105 } |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
106 |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
107 return 0; |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
108 } //FIXME cleanup like ff_h264_check_intra_pred_mode |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
109 |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
110 /** |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
111 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
112 */ |
10852 | 113 int ff_h264_check_intra_pred_mode(H264Context *h, int mode){ |
1168 | 114 MpegEncContext * const s = &h->s; |
115 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
116 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
2967 | 117 |
4529 | 118 if(mode > 6U) { |
2392 | 119 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 | 120 return -1; |
2392 | 121 } |
2967 | 122 |
1168 | 123 if(!(h->top_samples_available&0x8000)){ |
124 mode= top[ mode ]; | |
125 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
126 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 | 127 return -1; |
128 } | |
129 } | |
2967 | 130 |
7532 | 131 if((h->left_samples_available&0x8080) != 0x8080){ |
1168 | 132 mode= left[ mode ]; |
7532 | 133 if(h->left_samples_available&0x8080){ //mad cow disease mode, aka MBAFF + constrained_intra_pred |
134 mode= ALZHEIMER_DC_L0T_PRED8x8 + (!(h->left_samples_available&0x8000)) + 2*(mode == DC_128_PRED8x8); | |
135 } | |
1168 | 136 if(mode<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
137 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 | 138 return -1; |
2967 | 139 } |
1168 | 140 } |
141 | |
142 return mode; | |
143 } | |
144 | |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
145 const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length){ |
1168 | 146 int i, si, di; |
147 uint8_t *dst; | |
5174 | 148 int bufidx; |
1168 | 149 |
2979 | 150 // src[0]&0x80; //forbidden bit |
1168 | 151 h->nal_ref_idc= src[0]>>5; |
152 h->nal_unit_type= src[0]&0x1F; | |
153 | |
154 src++; length--; | |
2967 | 155 #if 0 |
1168 | 156 for(i=0; i<length; i++) |
157 printf("%2X ", src[i]); | |
158 #endif | |
8440
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
159 |
8590 | 160 #if HAVE_FAST_UNALIGNED |
161 # if HAVE_FAST_64BIT | |
8440
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
162 # define RS 7 |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
163 for(i=0; i+1<length; i+=9){ |
11203 | 164 if(!((~AV_RN64A(src+i) & (AV_RN64A(src+i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL)) |
8440
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
165 # else |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
166 # define RS 3 |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
167 for(i=0; i+1<length; i+=5){ |
11203 | 168 if(!((~AV_RN32A(src+i) & (AV_RN32A(src+i) - 0x01000101U)) & 0x80008080U)) |
8440
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
169 # endif |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
170 continue; |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
171 if(i>0 && !src[i]) i--; |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
172 while(src[i]) i++; |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
173 #else |
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
174 # define RS 0 |
1168 | 175 for(i=0; i+1<length; i+=2){ |
176 if(src[i]) continue; | |
177 if(i>0 && src[i-1]==0) i--; | |
8440
649ce1b30344
Optimize 0 0 0-3 search, 45% faster on pentium dual.
michael
parents:
8438
diff
changeset
|
178 #endif |
1168 | 179 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ |
180 if(src[i+2]!=3){ | |
181 /* startcode, so we must be past the end */ | |
182 length=i; | |
183 } | |
184 break; | |
185 } | |
8441 | 186 i-= RS; |
1168 | 187 } |
188 | |
189 if(i>=length-1){ //no escaped 0 | |
190 *dst_length= length; | |
191 *consumed= length+1; //+1 for the header | |
2967 | 192 return src; |
1168 | 193 } |
194 | |
5174 | 195 bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data |
9415
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9386
diff
changeset
|
196 av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE); |
5174 | 197 dst= h->rbsp_buffer[bufidx]; |
1168 | 198 |
4362
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
199 if (dst == NULL){ |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
200 return NULL; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
201 } |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
202 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
203 //printf("decoding esc\n"); |
8446 | 204 memcpy(dst, src, i); |
205 si=di=i; | |
206 while(si+2<length){ | |
1168 | 207 //remove escapes (very rare 1:2^22) |
8446 | 208 if(src[si+2]>3){ |
209 dst[di++]= src[si++]; | |
210 dst[di++]= src[si++]; | |
211 }else if(src[si]==0 && src[si+1]==0){ | |
1168 | 212 if(src[si+2]==3){ //escape |
213 dst[di++]= 0; | |
214 dst[di++]= 0; | |
215 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
216 continue; |
1168 | 217 }else //next start code |
8446 | 218 goto nsc; |
1168 | 219 } |
220 | |
221 dst[di++]= src[si++]; | |
222 } | |
8446 | 223 while(si<length) |
224 dst[di++]= src[si++]; | |
225 nsc: | |
1168 | 226 |
8396
11b1f7762830
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents:
8395
diff
changeset
|
227 memset(dst+di, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
11b1f7762830
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.
astrange
parents:
8395
diff
changeset
|
228 |
1168 | 229 *dst_length= di; |
230 *consumed= si + 1;//+1 for the header | |
5129 | 231 //FIXME store exact number of bits in the getbitcontext (it is needed for decoding) |
1168 | 232 return dst; |
233 } | |
234 | |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
235 int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src){ |
1168 | 236 int v= *src; |
237 int r; | |
238 | |
4600 | 239 tprintf(h->s.avctx, "rbsp trailing %X\n", v); |
1168 | 240 |
241 for(r=1; r<9; r++){ | |
242 if(v&1) return r; | |
243 v>>=1; | |
244 } | |
245 return 0; | |
246 } | |
247 | |
248 /** | |
7374 | 249 * IDCT transforms the 16 dc values and dequantizes them. |
1168 | 250 * @param qp quantization parameter |
251 */ | |
2919 | 252 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 253 #define stride 16 |
254 int i; | |
255 int temp[16]; //FIXME check if this is a good idea | |
256 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
257 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
258 | |
259 //memset(block, 64, 2*256); | |
260 //return; | |
261 for(i=0; i<4; i++){ | |
262 const int offset= y_offset[i]; | |
263 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
264 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
265 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
266 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
267 | |
268 temp[4*i+0]= z0+z3; | |
269 temp[4*i+1]= z1+z2; | |
270 temp[4*i+2]= z1-z2; | |
271 temp[4*i+3]= z0-z3; | |
272 } | |
273 | |
274 for(i=0; i<4; i++){ | |
275 const int offset= x_offset[i]; | |
276 const int z0= temp[4*0+i] + temp[4*2+i]; | |
277 const int z1= temp[4*0+i] - temp[4*2+i]; | |
278 const int z2= temp[4*1+i] - temp[4*3+i]; | |
279 const int z3= temp[4*1+i] + temp[4*3+i]; | |
280 | |
7374 | 281 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_residual |
2919 | 282 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8)); |
283 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8)); | |
284 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8)); | |
1168 | 285 } |
286 } | |
287 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
288 #if 0 |
1168 | 289 /** |
7374 | 290 * DCT transforms the 16 dc values. |
1168 | 291 * @param qp quantization parameter ??? FIXME |
292 */ | |
293 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
294 // const int qmul= dequant_coeff[qp][0]; | |
295 int i; | |
296 int temp[16]; //FIXME check if this is a good idea | |
297 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
298 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
299 | |
300 for(i=0; i<4; i++){ | |
301 const int offset= y_offset[i]; | |
302 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
303 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
304 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
305 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
306 | |
307 temp[4*i+0]= z0+z3; | |
308 temp[4*i+1]= z1+z2; | |
309 temp[4*i+2]= z1-z2; | |
310 temp[4*i+3]= z0-z3; | |
311 } | |
312 | |
313 for(i=0; i<4; i++){ | |
314 const int offset= x_offset[i]; | |
315 const int z0= temp[4*0+i] + temp[4*2+i]; | |
316 const int z1= temp[4*0+i] - temp[4*2+i]; | |
317 const int z2= temp[4*1+i] - temp[4*3+i]; | |
318 const int z3= temp[4*1+i] + temp[4*3+i]; | |
319 | |
320 block[stride*0 +offset]= (z0 + z3)>>1; | |
321 block[stride*2 +offset]= (z1 + z2)>>1; | |
322 block[stride*8 +offset]= (z1 - z2)>>1; | |
323 block[stride*10+offset]= (z0 - z3)>>1; | |
324 } | |
325 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
326 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
327 |
1168 | 328 #undef xStride |
329 #undef stride | |
330 | |
2919 | 331 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 332 const int stride= 16*2; |
333 const int xStride= 16; | |
334 int a,b,c,d,e; | |
335 | |
336 a= block[stride*0 + xStride*0]; | |
337 b= block[stride*0 + xStride*1]; | |
338 c= block[stride*1 + xStride*0]; | |
339 d= block[stride*1 + xStride*1]; | |
340 | |
341 e= a-b; | |
342 a= a+b; | |
343 b= c-d; | |
344 c= c+d; | |
345 | |
2919 | 346 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7; |
347 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7; | |
348 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7; | |
349 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7; | |
1168 | 350 } |
351 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
352 #if 0 |
1168 | 353 static void chroma_dc_dct_c(DCTELEM *block){ |
354 const int stride= 16*2; | |
355 const int xStride= 16; | |
356 int a,b,c,d,e; | |
357 | |
358 a= block[stride*0 + xStride*0]; | |
359 b= block[stride*0 + xStride*1]; | |
360 c= block[stride*1 + xStride*0]; | |
361 d= block[stride*1 + xStride*1]; | |
362 | |
363 e= a-b; | |
364 a= a+b; | |
365 b= c-d; | |
366 c= c+d; | |
367 | |
368 block[stride*0 + xStride*0]= (a+c); | |
369 block[stride*0 + xStride*1]= (e+b); | |
370 block[stride*1 + xStride*0]= (a-c); | |
371 block[stride*1 + xStride*1]= (e-b); | |
372 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
373 #endif |
1168 | 374 |
375 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
376 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
377 int src_x_offset, int src_y_offset, | |
378 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
379 MpegEncContext * const s = &h->s; | |
380 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
3316 | 381 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; |
1168 | 382 const int luma_xy= (mx&3) + ((my&3)<<2); |
3316 | 383 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize; |
384 uint8_t * src_cb, * src_cr; | |
385 int extra_width= h->emu_edge_width; | |
386 int extra_height= h->emu_edge_height; | |
1168 | 387 int emu=0; |
388 const int full_mx= mx>>2; | |
389 const int full_my= my>>2; | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
390 const int pic_width = 16*s->mb_width; |
5815 | 391 const int pic_height = 16*s->mb_height >> MB_FIELD; |
2967 | 392 |
1168 | 393 if(mx&7) extra_width -= 3; |
394 if(my&7) extra_height -= 3; | |
2967 | 395 |
396 if( full_mx < 0-extra_width | |
397 || full_my < 0-extra_height | |
398 || full_mx + 16/*FIXME*/ > pic_width + extra_width | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
399 || full_my + 16/*FIXME*/ > pic_height + extra_height){ |
3316 | 400 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); |
401 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize; | |
1168 | 402 emu=1; |
403 } | |
2967 | 404 |
3316 | 405 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps? |
1168 | 406 if(!square){ |
3316 | 407 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize); |
1168 | 408 } |
2967 | 409 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
410 if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return; |
2967 | 411 |
5815 | 412 if(MB_FIELD){ |
3316 | 413 // 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
|
414 my += 2 * ((s->mb_y & 1) - (pic->reference - 1)); |
3316 | 415 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); |
416 } | |
417 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
418 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
1168 | 419 |
420 if(emu){ | |
3316 | 421 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); |
422 src_cb= s->edge_emu_buffer; | |
423 } | |
424 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7); | |
425 | |
426 if(emu){ | |
427 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 | 428 src_cr= s->edge_emu_buffer; |
429 } | |
3316 | 430 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7); |
1168 | 431 } |
432 | |
2415 | 433 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
1168 | 434 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
435 int x_offset, int y_offset, | |
436 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
437 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
438 int list0, int list1){ | |
439 MpegEncContext * const s = &h->s; | |
440 qpel_mc_func *qpix_op= qpix_put; | |
441 h264_chroma_mc_func chroma_op= chroma_put; | |
2967 | 442 |
3316 | 443 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
444 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
445 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
1168 | 446 x_offset += 8*s->mb_x; |
5815 | 447 y_offset += 8*(s->mb_y >> MB_FIELD); |
2967 | 448 |
1168 | 449 if(list0){ |
1169 | 450 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 451 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
452 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
453 qpix_op, chroma_op); | |
454 | |
455 qpix_op= qpix_avg; | |
456 chroma_op= chroma_avg; | |
457 } | |
458 | |
459 if(list1){ | |
1169 | 460 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 461 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
462 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
463 qpix_op, chroma_op); | |
464 } | |
465 } | |
466 | |
2415 | 467 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
468 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
469 int x_offset, int y_offset, | |
470 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
471 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
472 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
473 int list0, int list1){ | |
474 MpegEncContext * const s = &h->s; | |
475 | |
3316 | 476 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
477 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
478 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
2415 | 479 x_offset += 8*s->mb_x; |
5815 | 480 y_offset += 8*(s->mb_y >> MB_FIELD); |
2967 | 481 |
2415 | 482 if(list0 && list1){ |
483 /* don't optimize for luma-only case, since B-frames usually | |
484 * use implicit weights => chroma too. */ | |
485 uint8_t *tmp_cb = s->obmc_scratchpad; | |
3316 | 486 uint8_t *tmp_cr = s->obmc_scratchpad + 8; |
487 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize; | |
2415 | 488 int refn0 = h->ref_cache[0][ scan8[n] ]; |
489 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
490 | |
491 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
492 dest_y, dest_cb, dest_cr, | |
493 x_offset, y_offset, qpix_put, chroma_put); | |
494 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
495 tmp_y, tmp_cb, tmp_cr, | |
496 x_offset, y_offset, qpix_put, chroma_put); | |
497 | |
498 if(h->use_weight == 2){ | |
11558 | 499 int weight0 = h->implicit_weight[refn0][refn1][s->mb_y&1]; |
2415 | 500 int weight1 = 64 - weight0; |
3316 | 501 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0); |
502 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
503 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
2415 | 504 }else{ |
3316 | 505 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom, |
11349 | 506 h->luma_weight[refn0][0][0] , h->luma_weight[refn1][1][0], |
507 h->luma_weight[refn0][0][1] + h->luma_weight[refn1][1][1]); | |
3316 | 508 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
11349 | 509 h->chroma_weight[refn0][0][0][0] , h->chroma_weight[refn1][1][0][0], |
510 h->chroma_weight[refn0][0][0][1] + h->chroma_weight[refn1][1][0][1]); | |
3316 | 511 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
11349 | 512 h->chroma_weight[refn0][0][1][0] , h->chroma_weight[refn1][1][1][0], |
513 h->chroma_weight[refn0][0][1][1] + h->chroma_weight[refn1][1][1][1]); | |
2415 | 514 } |
515 }else{ | |
516 int list = list1 ? 1 : 0; | |
517 int refn = h->ref_cache[list][ scan8[n] ]; | |
518 Picture *ref= &h->ref_list[list][refn]; | |
519 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
520 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
521 qpix_put, chroma_put); | |
522 | |
3316 | 523 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom, |
11349 | 524 h->luma_weight[refn][list][0], h->luma_weight[refn][list][1]); |
2415 | 525 if(h->use_weight_chroma){ |
3316 | 526 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
11349 | 527 h->chroma_weight[refn][list][0][0], h->chroma_weight[refn][list][0][1]); |
3316 | 528 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
11349 | 529 h->chroma_weight[refn][list][1][0], h->chroma_weight[refn][list][1][1]); |
2415 | 530 } |
531 } | |
532 } | |
533 | |
534 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
535 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
536 int x_offset, int y_offset, | |
537 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
538 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2967 | 539 h264_weight_func *weight_op, h264_biweight_func *weight_avg, |
2415 | 540 int list0, int list1){ |
541 if((h->use_weight==2 && list0 && list1 | |
11558 | 542 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ][h->s.mb_y&1] != 32)) |
2415 | 543 || h->use_weight==1) |
544 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
545 x_offset, y_offset, qpix_put, chroma_put, | |
546 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
547 else | |
548 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
549 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
550 } | |
551 | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
552 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
|
553 /* fetch pixels for estimated mv 4 macroblocks ahead |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
554 * optimized for 64byte cache lines */ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
555 MpegEncContext * const s = &h->s; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
556 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
|
557 if(refn >= 0){ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
558 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
|
559 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
|
560 uint8_t **src= h->ref_list[list][refn].data; |
3316 | 561 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
|
562 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
|
563 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
|
564 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
|
565 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
566 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
567 |
1168 | 568 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
569 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2415 | 570 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
571 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
1168 | 572 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
573 const int mb_xy= h->mb_xy; |
1168 | 574 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2967 | 575 |
1168 | 576 assert(IS_INTER(mb_type)); |
2967 | 577 |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
578 prefetch_motion(h, 0); |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
579 |
1168 | 580 if(IS_16X16(mb_type)){ |
581 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
582 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
10930 | 583 weight_op, weight_avg, |
1168 | 584 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
585 }else if(IS_16X8(mb_type)){ | |
586 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
587 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 588 &weight_op[1], &weight_avg[1], |
1168 | 589 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
590 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
591 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 592 &weight_op[1], &weight_avg[1], |
1168 | 593 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
594 }else if(IS_8X16(mb_type)){ | |
3316 | 595 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, |
1168 | 596 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 597 &weight_op[2], &weight_avg[2], |
1168 | 598 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
3316 | 599 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, |
1168 | 600 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 601 &weight_op[2], &weight_avg[2], |
1168 | 602 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
603 }else{ | |
604 int i; | |
2967 | 605 |
1168 | 606 assert(IS_8X8(mb_type)); |
607 | |
608 for(i=0; i<4; i++){ | |
609 const int sub_mb_type= h->sub_mb_type[i]; | |
610 const int n= 4*i; | |
611 int x_offset= (i&1)<<2; | |
612 int y_offset= (i&2)<<1; | |
613 | |
614 if(IS_SUB_8X8(sub_mb_type)){ | |
615 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
616 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 617 &weight_op[3], &weight_avg[3], |
1168 | 618 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
619 }else if(IS_SUB_8X4(sub_mb_type)){ | |
620 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
621 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 622 &weight_op[4], &weight_avg[4], |
1168 | 623 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
624 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
625 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 626 &weight_op[4], &weight_avg[4], |
1168 | 627 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
628 }else if(IS_SUB_4X8(sub_mb_type)){ | |
3316 | 629 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, |
1168 | 630 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 631 &weight_op[5], &weight_avg[5], |
1168 | 632 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3316 | 633 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, |
1168 | 634 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 635 &weight_op[5], &weight_avg[5], |
1168 | 636 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
637 }else{ | |
638 int j; | |
639 assert(IS_SUB_4X4(sub_mb_type)); | |
640 for(j=0; j<4; j++){ | |
641 int sub_x_offset= x_offset + 2*(j&1); | |
642 int sub_y_offset= y_offset + (j&2); | |
643 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
644 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 645 &weight_op[6], &weight_avg[6], |
1168 | 646 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
647 } | |
648 } | |
649 } | |
650 } | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
651 |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
652 prefetch_motion(h, 1); |
1168 | 653 } |
654 | |
655 | |
656 static void free_tables(H264Context *h){ | |
5079 | 657 int i; |
5642 | 658 H264Context *hx; |
1168 | 659 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
|
660 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
|
661 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
|
662 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
|
663 av_freep(&h->mvd_table[1]); |
2396 | 664 av_freep(&h->direct_table); |
1168 | 665 av_freep(&h->non_zero_count); |
666 av_freep(&h->slice_table_base); | |
667 h->slice_table= NULL; | |
10906 | 668 av_freep(&h->list_counts); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
669 |
1168 | 670 av_freep(&h->mb2b_xy); |
11282 | 671 av_freep(&h->mb2br_xy); |
2415 | 672 |
9386
a673af90ed8f
Loop up to MAX_THREADS instead of h->s.avctx->thread_count to free the thread
reimar
parents:
9384
diff
changeset
|
673 for(i = 0; i < MAX_THREADS; i++) { |
5642 | 674 hx = h->thread_context[i]; |
675 if(!hx) continue; | |
676 av_freep(&hx->top_borders[1]); | |
677 av_freep(&hx->top_borders[0]); | |
678 av_freep(&hx->s.obmc_scratchpad); | |
9862 | 679 av_freep(&hx->rbsp_buffer[1]); |
680 av_freep(&hx->rbsp_buffer[0]); | |
10528
6fe84da648e2
Reset rbsp buffer size when freeing its data buffer.
benoit
parents:
10514
diff
changeset
|
681 hx->rbsp_buffer_size[0] = 0; |
6fe84da648e2
Reset rbsp buffer size when freeing its data buffer.
benoit
parents:
10514
diff
changeset
|
682 hx->rbsp_buffer_size[1] = 0; |
9862 | 683 if (i) av_freep(&h->thread_context[i]); |
5642 | 684 } |
1168 | 685 } |
686 | |
2919 | 687 static void init_dequant8_coeff_table(H264Context *h){ |
688 int i,q,x; | |
11499 | 689 const int transpose = (h->h264dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly |
2919 | 690 h->dequant8_coeff[0] = h->dequant8_buffer[0]; |
691 h->dequant8_coeff[1] = h->dequant8_buffer[1]; | |
692 | |
693 for(i=0; i<2; i++ ){ | |
694 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){ | |
695 h->dequant8_coeff[1] = h->dequant8_buffer[0]; | |
696 break; | |
697 } | |
698 | |
699 for(q=0; q<52; q++){ | |
7993
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
700 int shift = div6[q]; |
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
701 int idx = rem6[q]; |
2919 | 702 for(x=0; x<64; x++) |
3174 | 703 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = |
704 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * | |
705 h->pps.scaling_matrix8[i][x]) << shift; | |
2919 | 706 } |
707 } | |
708 } | |
709 | |
710 static void init_dequant4_coeff_table(H264Context *h){ | |
711 int i,j,q,x; | |
11499 | 712 const int transpose = (h->h264dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly |
2919 | 713 for(i=0; i<6; i++ ){ |
714 h->dequant4_coeff[i] = h->dequant4_buffer[i]; | |
715 for(j=0; j<i; j++){ | |
716 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){ | |
717 h->dequant4_coeff[i] = h->dequant4_buffer[j]; | |
718 break; | |
719 } | |
720 } | |
721 if(j<i) | |
722 continue; | |
723 | |
724 for(q=0; q<52; q++){ | |
7993
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
725 int shift = div6[q] + 2; |
2dfff0e25b47
Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten
lu_zero
parents:
7974
diff
changeset
|
726 int idx = rem6[q]; |
2919 | 727 for(x=0; x<16; x++) |
3005 | 728 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = |
729 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * | |
2919 | 730 h->pps.scaling_matrix4[i][x]) << shift; |
731 } | |
732 } | |
733 } | |
734 | |
735 static void init_dequant_tables(H264Context *h){ | |
736 int i,x; | |
737 init_dequant4_coeff_table(h); | |
738 if(h->pps.transform_8x8_mode) | |
739 init_dequant8_coeff_table(h); | |
740 if(h->sps.transform_bypass){ | |
741 for(i=0; i<6; i++) | |
742 for(x=0; x<16; x++) | |
743 h->dequant4_coeff[i][0][x] = 1<<6; | |
744 if(h->pps.transform_8x8_mode) | |
745 for(i=0; i<2; i++) | |
746 for(x=0; x<64; x++) | |
747 h->dequant8_coeff[i][0][x] = 1<<6; | |
748 } | |
749 } | |
750 | |
751 | |
10852 | 752 int ff_h264_alloc_tables(H264Context *h){ |
1168 | 753 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
|
754 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
755 const int row_mb_num= 2*s->mb_stride*s->avctx->thread_count; |
2919 | 756 int x,y; |
1168 | 757 |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
758 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode, row_mb_num * 8 * sizeof(uint8_t), fail) |
10137
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
759 |
10906 | 760 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->non_zero_count , big_mb_num * 32 * sizeof(uint8_t), fail) |
10137
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
761 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base), fail) |
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
762 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table, big_mb_num * sizeof(uint16_t), fail) |
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
763 |
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
764 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t), fail) |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
765 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0], 16*row_mb_num * sizeof(uint8_t), fail); |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
766 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1], 16*row_mb_num * sizeof(uint8_t), fail); |
11289 | 767 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table, 4*big_mb_num * sizeof(uint8_t) , fail); |
10906 | 768 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts, big_mb_num * sizeof(uint8_t), fail) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
769 |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8042
diff
changeset
|
770 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(*h->slice_table_base)); |
3316 | 771 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; |
1168 | 772 |
10137
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
773 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy , big_mb_num * sizeof(uint32_t), fail); |
11282 | 774 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2br_xy , big_mb_num * sizeof(uint32_t), fail); |
1168 | 775 for(y=0; y<s->mb_height; y++){ |
776 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
|
777 const int mb_xy= x + y*s->mb_stride; |
1168 | 778 const int b_xy = 4*x + 4*y*h->b_stride; |
2967 | 779 |
1168 | 780 h->mb2b_xy [mb_xy]= b_xy; |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
781 h->mb2br_xy[mb_xy]= 8*(FMO ? mb_xy : (mb_xy % (2*s->mb_stride))); |
1168 | 782 } |
783 } | |
2415 | 784 |
2417 | 785 s->obmc_scratchpad = NULL; |
786 | |
2920 | 787 if(!h->dequant4_coeff[0]) |
788 init_dequant_tables(h); | |
789 | |
1168 | 790 return 0; |
791 fail: | |
792 free_tables(h); | |
793 return -1; | |
794 } | |
795 | |
5642 | 796 /** |
797 * Mimic alloc_tables(), but for every context thread. | |
798 */ | |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
799 static void clone_tables(H264Context *dst, H264Context *src, int i){ |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
800 MpegEncContext * const s = &src->s; |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
801 dst->intra4x4_pred_mode = src->intra4x4_pred_mode + i*8*2*s->mb_stride; |
5642 | 802 dst->non_zero_count = src->non_zero_count; |
803 dst->slice_table = src->slice_table; | |
804 dst->cbp_table = src->cbp_table; | |
805 dst->mb2b_xy = src->mb2b_xy; | |
11282 | 806 dst->mb2br_xy = src->mb2br_xy; |
5642 | 807 dst->chroma_pred_mode_table = src->chroma_pred_mode_table; |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
808 dst->mvd_table[0] = src->mvd_table[0] + i*8*2*s->mb_stride; |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
809 dst->mvd_table[1] = src->mvd_table[1] + i*8*2*s->mb_stride; |
5642 | 810 dst->direct_table = src->direct_table; |
10923 | 811 dst->list_counts = src->list_counts; |
5642 | 812 |
813 dst->s.obmc_scratchpad = NULL; | |
814 ff_h264_pred_init(&dst->hpc, src->s.codec_id); | |
815 } | |
816 | |
817 /** | |
818 * Init context | |
819 * Allocate buffers which are not shared amongst multiple threads. | |
820 */ | |
821 static int context_init(H264Context *h){ | |
10137
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
822 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail) |
9a670cfd1941
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents:
9985
diff
changeset
|
823 FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t), fail) |
5642 | 824 |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
825 h->ref_cache[0][scan8[5 ]+1] = h->ref_cache[0][scan8[7 ]+1] = h->ref_cache[0][scan8[13]+1] = |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
826 h->ref_cache[1][scan8[5 ]+1] = h->ref_cache[1][scan8[7 ]+1] = h->ref_cache[1][scan8[13]+1] = PART_NOT_AVAILABLE; |
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
827 |
5642 | 828 return 0; |
829 fail: | |
830 return -1; // free_tables will clean up for us | |
831 } | |
832 | |
11248
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
833 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size); |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
834 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6490
diff
changeset
|
835 static av_cold void common_init(H264Context *h){ |
1168 | 836 MpegEncContext * const s = &h->s; |
837 | |
838 s->width = s->avctx->width; | |
839 s->height = s->avctx->height; | |
840 s->codec_id= s->avctx->codec->id; | |
2967 | 841 |
11499 | 842 ff_h264dsp_init(&h->h264dsp); |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
843 ff_h264_pred_init(&h->hpc, s->codec_id); |
1168 | 844 |
2919 | 845 h->dequant_coeff_pps= -1; |
1698 | 846 s->unrestricted_mv=1; |
1168 | 847 s->decode=1; //FIXME |
2920 | 848 |
8402 | 849 dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early |
850 | |
2920 | 851 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t)); |
852 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
1168 | 853 } |
854 | |
11777 | 855 int ff_h264_decode_extradata(H264Context *h) |
856 { | |
857 AVCodecContext *avctx = h->s.avctx; | |
858 | |
859 if(*(char *)avctx->extradata == 1){ | |
11248
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
860 int i, cnt, nalsize; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
861 unsigned char *p = avctx->extradata; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
862 |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
863 h->is_avc = 1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
864 |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
865 if(avctx->extradata_size < 7) { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
866 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
867 return -1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
868 } |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
869 /* sps and pps in the avcC always have length coded with 2 bytes, |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
870 so put a fake nal_length_size = 2 while parsing them */ |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
871 h->nal_length_size = 2; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
872 // Decode sps from avcC |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
873 cnt = *(p+5) & 0x1f; // Number of sps |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
874 p += 6; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
875 for (i = 0; i < cnt; i++) { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
876 nalsize = AV_RB16(p) + 2; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
877 if(decode_nal_units(h, p, nalsize) < 0) { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
878 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
879 return -1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
880 } |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
881 p += nalsize; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
882 } |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
883 // Decode pps from avcC |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
884 cnt = *(p++); // Number of pps |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
885 for (i = 0; i < cnt; i++) { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
886 nalsize = AV_RB16(p) + 2; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
887 if(decode_nal_units(h, p, nalsize) != nalsize) { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
888 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
889 return -1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
890 } |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
891 p += nalsize; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
892 } |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
893 // Now store right nal length size, that will be use to parse all other nals |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
894 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
895 } else { |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
896 h->is_avc = 0; |
11777 | 897 if(decode_nal_units(h, avctx->extradata, avctx->extradata_size) < 0) |
11248
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
898 return -1; |
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
899 } |
11777 | 900 return 0; |
901 } | |
902 | |
903 av_cold int ff_h264_decode_init(AVCodecContext *avctx){ | |
904 H264Context *h= avctx->priv_data; | |
905 MpegEncContext * const s = &h->s; | |
906 | |
907 MPV_decode_defaults(s); | |
908 | |
909 s->avctx = avctx; | |
910 common_init(h); | |
911 | |
912 s->out_format = FMT_H264; | |
913 s->workaround_bugs= avctx->workaround_bugs; | |
914 | |
915 // set defaults | |
916 // s->decode_mb= ff_h263_decode_mb; | |
917 s->quarter_sample = 1; | |
918 if(!avctx->has_b_frames) | |
919 s->low_delay= 1; | |
920 | |
921 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; | |
922 | |
923 ff_h264_decode_init_vlc(); | |
924 | |
925 h->thread_context[0] = h; | |
926 h->outputed_poc = INT_MIN; | |
927 h->prev_poc_msb= 1<<16; | |
928 h->x264_build = -1; | |
929 ff_h264_reset_sei(h); | |
930 if(avctx->codec_id == CODEC_ID_H264){ | |
931 if(avctx->ticks_per_frame == 1){ | |
932 s->avctx->time_base.den *=2; | |
933 } | |
934 avctx->ticks_per_frame = 2; | |
935 } | |
936 | |
937 if(avctx->extradata_size > 0 && avctx->extradata && | |
938 ff_h264_decode_extradata(h)) | |
939 return -1; | |
940 | |
11249
6f17564ec228
Try to set has_b_frames in codec init if we know everything alraedy.
michael
parents:
11248
diff
changeset
|
941 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames < h->sps.num_reorder_frames){ |
6f17564ec228
Try to set has_b_frames in codec init if we know everything alraedy.
michael
parents:
11248
diff
changeset
|
942 s->avctx->has_b_frames = h->sps.num_reorder_frames; |
6f17564ec228
Try to set has_b_frames in codec init if we know everything alraedy.
michael
parents:
11248
diff
changeset
|
943 s->low_delay = 0; |
6f17564ec228
Try to set has_b_frames in codec init if we know everything alraedy.
michael
parents:
11248
diff
changeset
|
944 } |
11248
926dde10e50d
Move extradata reading code into codec init instead of doing it
michael
parents:
11236
diff
changeset
|
945 |
1168 | 946 return 0; |
947 } | |
948 | |
10852 | 949 int ff_h264_frame_start(H264Context *h){ |
1168 | 950 MpegEncContext * const s = &h->s; |
951 int i; | |
952 | |
2935 | 953 if(MPV_frame_start(s, s->avctx) < 0) |
954 return -1; | |
1168 | 955 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
|
956 /* |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
957 * 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
|
958 * This is incorrect for H.264; IDR markings must be used. |
7374 | 959 * 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
|
960 * 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
|
961 */ |
e3d7a78e2df3
Fix Picture.key_frame setting to be compatible with frame and field contexts. Part of PAFF implementation.
andoma
parents:
5772
diff
changeset
|
962 s->current_picture_ptr->key_frame= 0; |
9885 | 963 s->current_picture_ptr->mmco_reset= 0; |
1168 | 964 |
965 assert(s->linesize && s->uvlinesize); | |
966 | |
967 for(i=0; i<16; i++){ | |
968 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
|
969 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
1168 | 970 } |
971 for(i=0; i<4; i++){ | |
972 h->block_offset[16+i]= | |
973 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
|
974 h->block_offset[24+16+i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
975 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
1168 | 976 } |
977 | |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
978 /* 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
|
979 * FIXME: redo bipred weight to not require extra buffer? */ |
5642 | 980 for(i = 0; i < s->avctx->thread_count; i++) |
981 if(!h->thread_context[i]->s.obmc_scratchpad) | |
982 h->thread_context[i]->s.obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize); | |
3316 | 983 |
11465 | 984 /* some macroblocks can be accessed before they're available in case of lost slices, mbaff or threading*/ |
11466 | 985 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(*h->slice_table)); |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
986 |
1168 | 987 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
7318 | 988 |
7374 | 989 // We mark the current picture as non-reference after allocating it, so |
7318 | 990 // that if we break out due to an error it can be released automatically |
991 // in the next MPV_frame_start(). | |
992 // SVQ3 as well as most other codecs have only last/next/current and thus | |
993 // get released even with set reference, besides SVQ3 and others do not | |
994 // mark frames as reference later "naturally". | |
995 if(s->codec_id != CODEC_ID_SVQ3) | |
996 s->current_picture_ptr->reference= 0; | |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
997 |
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
998 s->current_picture_ptr->field_poc[0]= |
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
999 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
|
1000 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
|
1001 |
2935 | 1002 return 0; |
1168 | 1003 } |
1004 | |
5106 | 1005 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
|
1006 MpegEncContext * const s = &h->s; |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1007 uint8_t *top_border; |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1008 int top_idx = 1; |
2967 | 1009 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1010 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
|
1011 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
|
1012 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
|
1013 |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1014 if(!simple && FRAME_MBAFF){ |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1015 if(s->mb_y&1){ |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1016 if(!MB_MBAFF){ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1017 top_border = h->top_borders[0][s->mb_x]; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1018 AV_COPY128(top_border, src_y + 15*linesize); |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1019 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1020 AV_COPY64(top_border+16, src_cb+7*uvlinesize); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1021 AV_COPY64(top_border+24, src_cr+7*uvlinesize); |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1022 } |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1023 } |
10906 | 1024 }else if(MB_MBAFF){ |
1025 top_idx = 0; | |
1026 }else | |
1027 return; | |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1028 } |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1029 |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1030 top_border = h->top_borders[top_idx][s->mb_x]; |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1031 // 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
|
1032 // and the line above the bottom macroblock |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1033 AV_COPY128(top_border, src_y + 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
|
1034 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1035 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1036 AV_COPY64(top_border+16, src_cb+8*uvlinesize); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1037 AV_COPY64(top_border+24, 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
|
1038 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1039 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1040 |
5106 | 1041 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
|
1042 MpegEncContext * const s = &h->s; |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1043 int deblock_left; |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1044 int deblock_top; |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1045 int top_idx = 1; |
11003
72c026446d67
100l, correct wrong H.264+adaptive MBAFF decoding
astrange
parents:
11002
diff
changeset
|
1046 uint8_t *top_border_m1; |
72c026446d67
100l, correct wrong H.264+adaptive MBAFF decoding
astrange
parents:
11002
diff
changeset
|
1047 uint8_t *top_border; |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1048 |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1049 if(!simple && FRAME_MBAFF){ |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1050 if(s->mb_y&1){ |
10906 | 1051 if(!MB_MBAFF) |
1052 return; | |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1053 }else{ |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1054 top_idx = MB_MBAFF ? 0 : 1; |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1055 } |
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1056 } |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1057 |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1058 if(h->deblocking_filter == 2) { |
11202
778139a5e058
Simplify deblock_left/top condition for deblocking_filter=2
michael
parents:
11192
diff
changeset
|
1059 deblock_left = h->left_type[0]; |
778139a5e058
Simplify deblock_left/top condition for deblocking_filter=2
michael
parents:
11192
diff
changeset
|
1060 deblock_top = h->top_type; |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1061 } else { |
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1062 deblock_left = (s->mb_x > 0); |
7926
224dea3d9ac8
Avoid out of picture accesses when CODEC_FLAG_EMU_EDGE is set.
michael
parents:
7923
diff
changeset
|
1063 deblock_top = (s->mb_y > !!MB_FIELD); |
5177
ea61020e5e87
Don't swap back un-deblocked lines for intra prediction when
gpoirier
parents:
5174
diff
changeset
|
1064 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1065 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1066 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
|
1067 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
|
1068 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
|
1069 |
11003
72c026446d67
100l, correct wrong H.264+adaptive MBAFF decoding
astrange
parents:
11002
diff
changeset
|
1070 top_border_m1 = h->top_borders[top_idx][s->mb_x-1]; |
72c026446d67
100l, correct wrong H.264+adaptive MBAFF decoding
astrange
parents:
11002
diff
changeset
|
1071 top_border = h->top_borders[top_idx][s->mb_x]; |
72c026446d67
100l, correct wrong H.264+adaptive MBAFF decoding
astrange
parents:
11002
diff
changeset
|
1072 |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1073 #define XCHG(a,b,xchg)\ |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1074 if (xchg) AV_SWAP64(b,a);\ |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1075 else AV_COPY64(b,a); |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
1076 |
10906 | 1077 if(deblock_top){ |
1078 if(deblock_left){ | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1079 XCHG(top_border_m1+8, src_y -7, 1); |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1080 } |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1081 XCHG(top_border+0, src_y +1, xchg); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1082 XCHG(top_border+8, src_y +9, 1); |
2803 | 1083 if(s->mb_x+1 < s->mb_width){ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1084 XCHG(h->top_borders[top_idx][s->mb_x+1], src_y +17, 1); |
2755 | 1085 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
1086 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1087 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1088 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
10906 | 1089 if(deblock_top){ |
1090 if(deblock_left){ | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1091 XCHG(top_border_m1+16, src_cb -7, 1); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1092 XCHG(top_border_m1+24, src_cr -7, 1); |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1093 } |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1094 XCHG(top_border+16, src_cb+1, 1); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10989
diff
changeset
|
1095 XCHG(top_border+24, src_cr+1, 1); |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
1096 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1097 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1098 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
1099 |
4908
777f250df232
Fix multiple "inline/static is not at beginning of declaration" warnings.
diego
parents:
4896
diff
changeset
|
1100 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ |
1168 | 1101 MpegEncContext * const s = &h->s; |
1102 const int mb_x= s->mb_x; | |
1103 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
|
1104 const int mb_xy= h->mb_xy; |
1168 | 1105 const int mb_type= s->current_picture.mb_type[mb_xy]; |
1106 uint8_t *dest_y, *dest_cb, *dest_cr; | |
1107 int linesize, uvlinesize /*dct_offset*/; | |
1108 int i; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1109 int *block_offset = &h->block_offset[0]; |
8352 | 1110 const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass); |
8543
2cc3cf7b09b1
Disable SVQ3 checks if SVQ3 support is not compiled in.
diego
parents:
8525
diff
changeset
|
1111 /* is_h264 should always be true if SVQ3 is disabled. */ |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1112 const int is_h264 = !CONFIG_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264; |
2763 | 1113 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
|
1114 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride); |
1168 | 1115 |
8355
179f8e1327ce
Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents:
8354
diff
changeset
|
1116 dest_y = s->current_picture.data[0] + (mb_x + mb_y * s->linesize ) * 16; |
179f8e1327ce
Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents:
8354
diff
changeset
|
1117 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8; |
179f8e1327ce
Factorize 3 multiplications out, code becomes 3 cpu cycles faster.
michael
parents:
8354
diff
changeset
|
1118 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8; |
1168 | 1119 |
4000 | 1120 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4); |
1121 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2); | |
1122 | |
10906 | 1123 h->list_counts[mb_xy]= h->list_count; |
1124 | |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1125 if (!simple && MB_FIELD) { |
3316 | 1126 linesize = h->mb_linesize = s->linesize * 2; |
1127 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
|
1128 block_offset = &h->block_offset[24]; |
7374 | 1129 if(mb_y&1){ //FIXME move out of this function? |
1168 | 1130 dest_y -= s->linesize*15; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1131 dest_cb-= s->uvlinesize*7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1132 dest_cr-= s->uvlinesize*7; |
1168 | 1133 } |
3316 | 1134 if(FRAME_MBAFF) { |
1135 int list; | |
4533 | 1136 for(list=0; list<h->list_count; list++){ |
3316 | 1137 if(!USES_LIST(mb_type, list)) |
1138 continue; | |
1139 if(IS_16X16(mb_type)){ | |
1140 int8_t *ref = &h->ref_cache[list][scan8[0]]; | |
6203 | 1141 fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1); |
3316 | 1142 }else{ |
1143 for(i=0; i<16; i+=4){ | |
1144 int ref = h->ref_cache[list][scan8[i]]; | |
1145 if(ref >= 0) | |
6203 | 1146 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, (16+ref)^(s->mb_y&1), 1); |
3316 | 1147 } |
1148 } | |
1149 } | |
1150 } | |
1168 | 1151 } else { |
3316 | 1152 linesize = h->mb_linesize = s->linesize; |
1153 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
1168 | 1154 // dct_offset = s->linesize * 16; |
1155 } | |
2967 | 1156 |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1157 if (!simple && IS_INTRA_PCM(mb_type)) { |
7450 | 1158 for (i=0; i<16; i++) { |
1159 memcpy(dest_y + i* linesize, h->mb + i*8, 16); | |
1160 } | |
1161 for (i=0; i<8; i++) { | |
1162 memcpy(dest_cb+ i*uvlinesize, h->mb + 128 + i*4, 8); | |
1163 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
|
1164 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1165 } else { |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1166 if(IS_INTRA(mb_type)){ |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1167 if(h->deblocking_filter) |
5106 | 1168 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
|
1169 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1170 if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
1171 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
|
1172 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
|
1173 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1174 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1175 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
|
1176 if(simple || !s->encoding){ |
2755 | 1177 if(IS_8x8DCT(mb_type)){ |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1178 if(transform_bypass){ |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1179 idct_dc_add = |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1180 idct_add = s->dsp.add_pixels8; |
8382
fe7d1c920aeb
Remove useless IS_8x8DCT check i forgot, spotted by dark shikari.
michael
parents:
8379
diff
changeset
|
1181 }else{ |
11499 | 1182 idct_dc_add = h->h264dsp.h264_idct8_dc_add; |
1183 idct_add = h->h264dsp.h264_idct8_add; | |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1184 } |
2755 | 1185 for(i=0; i<16; i+=4){ |
1186 uint8_t * const ptr= dest_y + block_offset[i]; | |
1187 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
8352 | 1188 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){ |
1189 h->hpc.pred8x8l_add[dir](ptr, h->mb + i*16, linesize); | |
1190 }else{ | |
8357
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1191 const int nnz = h->non_zero_count_cache[ scan8[i] ]; |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1192 h->hpc.pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1193 (h->topright_samples_available<<i)&0x4000, linesize); |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1194 if(nnz){ |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1195 if(nnz == 1 && h->mb[i*16]) |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1196 idct_dc_add(ptr, h->mb + i*16, linesize); |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1197 else |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1198 idct_add (ptr, h->mb + i*16, linesize); |
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1199 } |
8352 | 1200 } |
2755 | 1201 } |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1202 }else{ |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1203 if(transform_bypass){ |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1204 idct_dc_add = |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1205 idct_add = s->dsp.add_pixels4; |
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1206 }else{ |
11499 | 1207 idct_dc_add = h->h264dsp.h264_idct_dc_add; |
1208 idct_add = h->h264dsp.h264_idct_add; | |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1209 } |
8389 | 1210 for(i=0; i<16; i++){ |
1211 uint8_t * const ptr= dest_y + block_offset[i]; | |
1212 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
1213 | |
1214 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){ | |
1215 h->hpc.pred4x4_add[dir](ptr, h->mb + i*16, linesize); | |
1216 }else{ | |
1217 uint8_t *topright; | |
1218 int nnz, tr; | |
1219 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){ | |
1220 const int topright_avail= (h->topright_samples_available<<i)&0x8000; | |
1221 assert(mb_y || linesize <= block_offset[i]); | |
1222 if(!topright_avail){ | |
1223 tr= ptr[3 - linesize]*0x01010101; | |
1224 topright= (uint8_t*) &tr; | |
1225 }else | |
1226 topright= ptr + 4 - linesize; | |
8357
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1227 }else |
8389 | 1228 topright= NULL; |
1229 | |
1230 h->hpc.pred4x4[ dir ](ptr, topright, linesize); | |
1231 nnz = h->non_zero_count_cache[ scan8[i] ]; | |
1232 if(nnz){ | |
1233 if(is_h264){ | |
1234 if(nnz == 1 && h->mb[i*16]) | |
1235 idct_dc_add(ptr, h->mb + i*16, linesize); | |
1236 else | |
1237 idct_add (ptr, h->mb + i*16, linesize); | |
1238 }else | |
11031 | 1239 ff_svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); |
8389 | 1240 } |
8357
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1241 } |
8352 | 1242 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1243 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1244 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1245 }else{ |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5631
diff
changeset
|
1246 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
|
1247 if(is_h264){ |
2763 | 1248 if(!transform_bypass) |
5727 | 1249 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]); |
2763 | 1250 }else |
11031 | 1251 ff_svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1252 } |
7522
4017c5ba7bab
Remove odd pairwise deblock filtering applied to MBAFF MBs.
michael
parents:
7498
diff
changeset
|
1253 if(h->deblocking_filter) |
5106 | 1254 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
|
1255 }else if(is_h264){ |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1256 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
|
1257 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
|
1258 s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab, |
11499 | 1259 h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1260 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1261 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1262 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1263 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
|
1264 if(is_h264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1265 if(IS_INTRA16x16(mb_type)){ |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1266 if(transform_bypass){ |
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1267 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){ |
8377 | 1268 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize); |
1269 }else{ | |
1270 for(i=0; i<16; i++){ | |
1271 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) | |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1272 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + i*16, linesize); |
8377 | 1273 } |
8357
1ef90fd7706a
Fix indention, also do a little vertical alignment of changed lines.
michael
parents:
8355
diff
changeset
|
1274 } |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1275 }else{ |
11499 | 1276 h->h264dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |
8352 | 1277 } |
8374
9000fd7c166e
Skip non intra luma code when there is no coded luma.
michael
parents:
8372
diff
changeset
|
1278 }else if(h->cbp&15){ |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1279 if(transform_bypass){ |
8377 | 1280 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
8379
be5e0a75b457
Do not calculate idct_dc_add/idct_add when the variables are unused.
michael
parents:
8378
diff
changeset
|
1281 idct_add= IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4; |
8377 | 1282 for(i=0; i<16; i+=di){ |
8378 | 1283 if(h->non_zero_count_cache[ scan8[i] ]){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1284 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
8377 | 1285 } |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1286 } |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1287 }else{ |
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1288 if(IS_8x8DCT(mb_type)){ |
11499 | 1289 h->h264dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1290 }else{ |
11499 | 1291 h->h264dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |
8376
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1292 } |
e1b242224970
Use the new idct functions (except chroma as it was slower in benchmarks)
michael
parents:
8374
diff
changeset
|
1293 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1294 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1295 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1296 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
|
1297 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
|
1298 uint8_t * const ptr= dest_y + block_offset[i]; |
11031 | 1299 ff_svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1234 | 1300 } |
1168 | 1301 } |
1302 } | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1303 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1304 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1305 if((simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1306 uint8_t *dest[2] = {dest_cb, dest_cr}; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1307 if(transform_bypass){ |
8388
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1308 if(IS_INTRA(mb_type) && h->sps.profile_idc==244 && (h->chroma_pred_mode==VERT_PRED8x8 || h->chroma_pred_mode==HOR_PRED8x8)){ |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1309 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[0], block_offset + 16, h->mb + 16*16, uvlinesize); |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1310 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[1], block_offset + 20, h->mb + 20*16, uvlinesize); |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1311 }else{ |
8390 | 1312 idct_add = s->dsp.add_pixels4; |
8388
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1313 for(i=16; i<16+8; i++){ |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1314 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1315 idct_add (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize); |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1316 } |
9eb29759df54
Reorder ifs in chroma hl_decode_mb to avoid a duplicate transform_bypass
michael
parents:
8387
diff
changeset
|
1317 } |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
1318 }else{ |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
1319 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
|
1320 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]); |
8389 | 1321 if(is_h264){ |
12492
58a960d6e34c
Rename h264_idct_sse2.asm to h264_idct.asm; move inline IDCT asm from
rbultje
parents:
12094
diff
changeset
|
1322 h->h264dsp.h264_idct_add8(dest, block_offset, |
58a960d6e34c
Rename h264_idct_sse2.asm to h264_idct.asm; move inline IDCT asm from
rbultje
parents:
12094
diff
changeset
|
1323 h->mb, uvlinesize, |
58a960d6e34c
Rename h264_idct_sse2.asm to h264_idct.asm; move inline IDCT asm from
rbultje
parents:
12094
diff
changeset
|
1324 h->non_zero_count_cache); |
8389 | 1325 }else{ |
1326 for(i=16; i<16+8; i++){ | |
1327 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
1328 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i]; | |
11031 | 1329 ff_svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, ff_h264_chroma_qp[s->qscale + 12] - 12, 2); |
8389 | 1330 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
1331 } |
1250 | 1332 } |
1168 | 1333 } |
1334 } | |
1335 } | |
8415 | 1336 if(h->cbp || IS_INTRA(mb_type)) |
1337 s->dsp.clear_blocks(h->mb); | |
1168 | 1338 } |
1339 | |
1340 /** | |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1341 * 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
|
1342 */ |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1343 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
|
1344 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
|
1345 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1346 |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1347 /** |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1348 * 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
|
1349 */ |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1350 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
|
1351 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
|
1352 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1353 |
10852 | 1354 void ff_h264_hl_decode_mb(H264Context *h){ |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1355 MpegEncContext * const s = &h->s; |
6783
df0893f4fd86
Store mb_xy in H264Context and only calculate it once per MB.
astrange
parents:
6753
diff
changeset
|
1356 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
|
1357 const int mb_type= s->current_picture.mb_type[mb_xy]; |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1358 int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0; |
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
1359 |
4587
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1360 if (is_complex) |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1361 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
|
1362 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
|
1363 } |
644687c58928
h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
michael
parents:
4556
diff
changeset
|
1364 |
1168 | 1365 static int pred_weight_table(H264Context *h){ |
1366 MpegEncContext * const s = &h->s; | |
1367 int list, i; | |
2415 | 1368 int luma_def, chroma_def; |
2967 | 1369 |
2415 | 1370 h->use_weight= 0; |
1371 h->use_weight_chroma= 0; | |
1168 | 1372 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
1373 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2415 | 1374 luma_def = 1<<h->luma_log2_weight_denom; |
1375 chroma_def = 1<<h->chroma_log2_weight_denom; | |
1168 | 1376 |
1377 for(list=0; list<2; list++){ | |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1378 h->luma_weight_flag[list] = 0; |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1379 h->chroma_weight_flag[list] = 0; |
1168 | 1380 for(i=0; i<h->ref_count[list]; i++){ |
1381 int luma_weight_flag, chroma_weight_flag; | |
2967 | 1382 |
1168 | 1383 luma_weight_flag= get_bits1(&s->gb); |
1384 if(luma_weight_flag){ | |
11349 | 1385 h->luma_weight[i][list][0]= get_se_golomb(&s->gb); |
1386 h->luma_weight[i][list][1]= get_se_golomb(&s->gb); | |
1387 if( h->luma_weight[i][list][0] != luma_def | |
1388 || h->luma_weight[i][list][1] != 0) { | |
2415 | 1389 h->use_weight= 1; |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1390 h->luma_weight_flag[list]= 1; |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1391 } |
2415 | 1392 }else{ |
11349 | 1393 h->luma_weight[i][list][0]= luma_def; |
1394 h->luma_weight[i][list][1]= 0; | |
1168 | 1395 } |
1396 | |
7407 | 1397 if(CHROMA){ |
7408 | 1398 chroma_weight_flag= get_bits1(&s->gb); |
1399 if(chroma_weight_flag){ | |
1400 int j; | |
1401 for(j=0; j<2; j++){ | |
11349 | 1402 h->chroma_weight[i][list][j][0]= get_se_golomb(&s->gb); |
1403 h->chroma_weight[i][list][j][1]= get_se_golomb(&s->gb); | |
1404 if( h->chroma_weight[i][list][j][0] != chroma_def | |
1405 || h->chroma_weight[i][list][j][1] != 0) { | |
7408 | 1406 h->use_weight_chroma= 1; |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1407 h->chroma_weight_flag[list]= 1; |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
1408 } |
7408 | 1409 } |
1410 }else{ | |
1411 int j; | |
1412 for(j=0; j<2; j++){ | |
11349 | 1413 h->chroma_weight[i][list][j][0]= chroma_def; |
1414 h->chroma_weight[i][list][j][1]= 0; | |
7408 | 1415 } |
2415 | 1416 } |
7407 | 1417 } |
1168 | 1418 } |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
1419 if(h->slice_type_nos != FF_B_TYPE) break; |
1168 | 1420 } |
2415 | 1421 h->use_weight= h->use_weight || h->use_weight_chroma; |
1168 | 1422 return 0; |
1423 } | |
1424 | |
11558 | 1425 /** |
1426 * Initialize implicit_weight table. | |
12064 | 1427 * @param field 0/1 initialize the weight for interlaced MBAFF |
11558 | 1428 * -1 initializes the rest |
1429 */ | |
1430 static void implicit_weight_table(H264Context *h, int field){ | |
2415 | 1431 MpegEncContext * const s = &h->s; |
11558 | 1432 int ref0, ref1, i, cur_poc, ref_start, ref_count0, ref_count1; |
2415 | 1433 |
8956
de631175196e
Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents:
8955
diff
changeset
|
1434 for (i = 0; i < 2; i++) { |
de631175196e
Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents:
8955
diff
changeset
|
1435 h->luma_weight_flag[i] = 0; |
de631175196e
Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents:
8955
diff
changeset
|
1436 h->chroma_weight_flag[i] = 0; |
de631175196e
Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents:
8955
diff
changeset
|
1437 } |
de631175196e
Move initialization of {luma,chroma}_weight_flag[] up,
benoit
parents:
8955
diff
changeset
|
1438 |
11558 | 1439 if(field < 0){ |
1440 cur_poc = s->current_picture_ptr->poc; | |
1441 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF | |
2415 | 1442 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ |
1443 h->use_weight= 0; | |
1444 h->use_weight_chroma= 0; | |
1445 return; | |
1446 } | |
11558 | 1447 ref_start= 0; |
1448 ref_count0= h->ref_count[0]; | |
1449 ref_count1= h->ref_count[1]; | |
1450 }else{ | |
1451 cur_poc = s->current_picture_ptr->field_poc[field]; | |
1452 ref_start= 16; | |
1453 ref_count0= 16+2*h->ref_count[0]; | |
1454 ref_count1= 16+2*h->ref_count[1]; | |
1455 } | |
2415 | 1456 |
1457 h->use_weight= 2; | |
1458 h->use_weight_chroma= 2; | |
1459 h->luma_log2_weight_denom= 5; | |
1460 h->chroma_log2_weight_denom= 5; | |
1461 | |
11558 | 1462 for(ref0=ref_start; ref0 < ref_count0; ref0++){ |
2415 | 1463 int poc0 = h->ref_list[0][ref0].poc; |
11558 | 1464 for(ref1=ref_start; ref1 < ref_count1; ref1++){ |
2519 | 1465 int poc1 = h->ref_list[1][ref1].poc; |
4594 | 1466 int td = av_clip(poc1 - poc0, -128, 127); |
11558 | 1467 int w= 32; |
2415 | 1468 if(td){ |
4594 | 1469 int tb = av_clip(cur_poc - poc0, -128, 127); |
4001 | 1470 int tx = (16384 + (FFABS(td) >> 1)) / td; |
11338 | 1471 int dist_scale_factor = (tb*tx + 32) >> 8; |
1472 if(dist_scale_factor >= -64 && dist_scale_factor <= 128) | |
11558 | 1473 w = 64 - dist_scale_factor; |
1474 } | |
1475 if(field<0){ | |
1476 h->implicit_weight[ref0][ref1][0]= | |
1477 h->implicit_weight[ref0][ref1][1]= w; | |
1478 }else{ | |
1479 h->implicit_weight[ref0][ref1][field]=w; | |
11338 | 1480 } |
2415 | 1481 } |
1482 } | |
1483 } | |
1484 | |
5768
09b557fcfafb
Modify unreference_pic implementation with PAFF in mind.
andoma
parents:
5767
diff
changeset
|
1485 /** |
2392 | 1486 * instantaneous decoder refresh. |
1168 | 1487 */ |
1488 static void idr(H264Context *h){ | |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
1489 ff_h264_remove_all_refs(h); |
7362
443fdc440854
Reset prev_frame_num for idr frames as required by the spec.
michael
parents:
7361
diff
changeset
|
1490 h->prev_frame_num= 0; |
7379 | 1491 h->prev_frame_num_offset= 0; |
1492 h->prev_poc_msb= | |
1493 h->prev_poc_lsb= 0; | |
1168 | 1494 } |
1495 | |
2640 | 1496 /* forget old pics after a seek */ |
1497 static void flush_dpb(AVCodecContext *avctx){ | |
1498 H264Context *h= avctx->priv_data; | |
1499 int i; | |
7283
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7277
diff
changeset
|
1500 for(i=0; i<MAX_DELAYED_PIC_COUNT; i++) { |
3144 | 1501 if(h->delayed_pic[i]) |
1502 h->delayed_pic[i]->reference= 0; | |
2640 | 1503 h->delayed_pic[i]= NULL; |
3144 | 1504 } |
7310
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
1505 h->outputed_poc= INT_MIN; |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
1506 h->prev_interlaced_frame = 1; |
2640 | 1507 idr(h); |
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
1508 if(h->s.current_picture_ptr) |
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
1509 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
|
1510 h->s.first_field= 0; |
10858 | 1511 ff_h264_reset_sei(h); |
5926
77403dc808cd
Call mpegvideo flush routine on h264 flush. Needed in particular
heydowns
parents:
5904
diff
changeset
|
1512 ff_mpeg_flush(avctx); |
2640 | 1513 } |
1514 | |
1168 | 1515 static int init_poc(H264Context *h){ |
1516 MpegEncContext * const s = &h->s; | |
1517 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
1518 int field_poc[2]; | |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
1519 Picture *cur = s->current_picture_ptr; |
1168 | 1520 |
7381 | 1521 h->frame_num_offset= h->prev_frame_num_offset; |
7380 | 1522 if(h->frame_num < h->prev_frame_num) |
7381 | 1523 h->frame_num_offset += max_frame_num; |
1168 | 1524 |
1525 if(h->sps.poc_type==0){ | |
1526 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
1527 | |
1528 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
1529 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
1530 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
1531 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
1532 else | |
1533 h->poc_msb = h->prev_poc_msb; | |
1534 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
2967 | 1535 field_poc[0] = |
1168 | 1536 field_poc[1] = h->poc_msb + h->poc_lsb; |
2967 | 1537 if(s->picture_structure == PICT_FRAME) |
1168 | 1538 field_poc[1] += h->delta_poc_bottom; |
1539 }else if(h->sps.poc_type==1){ | |
1540 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
1541 int i; | |
1542 | |
1543 if(h->sps.poc_cycle_length != 0) | |
1544 abs_frame_num = h->frame_num_offset + h->frame_num; | |
1545 else | |
1546 abs_frame_num = 0; | |
1547 | |
1548 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
1549 abs_frame_num--; | |
2967 | 1550 |
1168 | 1551 expected_delta_per_poc_cycle = 0; |
1552 for(i=0; i < h->sps.poc_cycle_length; i++) | |
1553 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
1554 | |
1555 if(abs_frame_num > 0){ | |
1556 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
1557 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
1558 | |
1559 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
1560 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
1561 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
1562 } else | |
1563 expectedpoc = 0; | |
1564 | |
2967 | 1565 if(h->nal_ref_idc == 0) |
1168 | 1566 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; |
2967 | 1567 |
1168 | 1568 field_poc[0] = expectedpoc + h->delta_poc[0]; |
1569 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
1570 | |
1571 if(s->picture_structure == PICT_FRAME) | |
1572 field_poc[1] += h->delta_poc[1]; | |
1573 }else{ | |
7381 | 1574 int poc= 2*(h->frame_num_offset + h->frame_num); |
1575 | |
1576 if(!h->nal_ref_idc) | |
1577 poc--; | |
7380 | 1578 |
1168 | 1579 field_poc[0]= poc; |
1580 field_poc[1]= poc; | |
1581 } | |
2967 | 1582 |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
1583 if(s->picture_structure != PICT_BOTTOM_FIELD) |
1168 | 1584 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
|
1585 if(s->picture_structure != PICT_TOP_FIELD) |
1168 | 1586 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
|
1587 cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]); |
1168 | 1588 |
1589 return 0; | |
1590 } | |
1591 | |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1592 |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1593 /** |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1594 * initialize scan tables |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1595 */ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1596 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
|
1597 int i; |
11499 | 1598 if(h->h264dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1599 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
|
1600 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
|
1601 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1602 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
|
1603 #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
|
1604 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
|
1605 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
|
1606 #undef T |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1607 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1608 } |
11499 | 1609 if(h->h264dsp.h264_idct8_add == ff_h264_idct8_add_c){ |
8646
8b52ac19a91c
remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents:
8627
diff
changeset
|
1610 memcpy(h->zigzag_scan8x8, ff_zigzag_direct, 64*sizeof(uint8_t)); |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1611 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
|
1612 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
|
1613 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
|
1614 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1615 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
|
1616 #define T(x) (x>>3) | ((x&7)<<3) |
8646
8b52ac19a91c
remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents:
8627
diff
changeset
|
1617 h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]); |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1618 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
|
1619 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
|
1620 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
|
1621 #undef T |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1622 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1623 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1624 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
|
1625 h->zigzag_scan_q0 = zigzag_scan; |
8646
8b52ac19a91c
remove zigzag_scan8x8, it is the same as ff_zigzag_direct
stefang
parents:
8627
diff
changeset
|
1626 h->zigzag_scan8x8_q0 = ff_zigzag_direct; |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1627 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
|
1628 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
|
1629 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
|
1630 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
|
1631 }else{ |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1632 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
|
1633 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
|
1634 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
|
1635 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
|
1636 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
|
1637 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
|
1638 } |
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1639 } |
5642 | 1640 |
9417 | 1641 static void field_end(H264Context *h){ |
1642 MpegEncContext * const s = &h->s; | |
1643 AVCodecContext * const avctx= s->avctx; | |
1644 s->mb_y= 0; | |
1645 | |
1646 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; | |
1647 s->current_picture_ptr->pict_type= s->pict_type; | |
1648 | |
1649 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) | |
1650 ff_vdpau_h264_set_reference_frames(s); | |
1651 | |
1652 if(!s->dropable) { | |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
1653 ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); |
9417 | 1654 h->prev_poc_msb= h->poc_msb; |
1655 h->prev_poc_lsb= h->poc_lsb; | |
1656 } | |
1657 h->prev_frame_num_offset= h->frame_num_offset; | |
1658 h->prev_frame_num= h->frame_num; | |
1659 | |
1660 if (avctx->hwaccel) { | |
1661 if (avctx->hwaccel->end_frame(avctx) < 0) | |
1662 av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); | |
1663 } | |
1664 | |
1665 if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) | |
1666 ff_vdpau_h264_picture_complete(s); | |
1667 | |
1668 /* | |
1669 * FIXME: Error handling code does not seem to support interlaced | |
1670 * when slices span multiple rows | |
1671 * The ff_er_add_slice calls don't work right for bottom | |
1672 * fields; they cause massive erroneous error concealing | |
1673 * Error marking covers both fields (top and bottom). | |
1674 * This causes a mismatched s->error_count | |
1675 * and a bad error table. Further, the error count goes to | |
1676 * INT_MAX when called for bottom field, because mb_y is | |
1677 * past end by one (callers fault) and resync_mb_y != 0 | |
1678 * causes problems for the first MB line, too. | |
1679 */ | |
1680 if (!FIELD_PICTURE) | |
1681 ff_er_frame_end(s); | |
1682 | |
1683 MPV_frame_end(s); | |
9419 | 1684 |
1685 h->current_slice=0; | |
9417 | 1686 } |
1687 | |
5642 | 1688 /** |
12024 | 1689 * Replicate H264 "master" context to thread contexts. |
5642 | 1690 */ |
1691 static void clone_slice(H264Context *dst, H264Context *src) | |
1692 { | |
1693 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset)); | |
1694 dst->s.current_picture_ptr = src->s.current_picture_ptr; | |
1695 dst->s.current_picture = src->s.current_picture; | |
1696 dst->s.linesize = src->s.linesize; | |
1697 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
|
1698 dst->s.first_field = src->s.first_field; |
5642 | 1699 |
1700 dst->prev_poc_msb = src->prev_poc_msb; | |
1701 dst->prev_poc_lsb = src->prev_poc_lsb; | |
1702 dst->prev_frame_num_offset = src->prev_frame_num_offset; | |
1703 dst->prev_frame_num = src->prev_frame_num; | |
1704 dst->short_ref_count = src->short_ref_count; | |
1705 | |
1706 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref)); | |
1707 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref)); | |
1708 memcpy(dst->default_ref_list, src->default_ref_list, sizeof(dst->default_ref_list)); | |
1709 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
|
1710 |
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
1711 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
|
1712 memcpy(dst->dequant8_coeff, src->dequant8_coeff, sizeof(src->dequant8_coeff)); |
5642 | 1713 } |
1714 | |
1168 | 1715 /** |
1716 * decodes a slice header. | |
6918 | 1717 * This will also call MPV_common_init() and frame_start() as needed. |
5642 | 1718 * |
1719 * @param h h264context | |
1720 * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding) | |
1721 * | |
6524 | 1722 * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded |
1168 | 1723 */ |
5642 | 1724 static int decode_slice_header(H264Context *h, H264Context *h0){ |
1168 | 1725 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
|
1726 MpegEncContext * const s0 = &h0->s; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
1727 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
|
1728 unsigned int pps_id; |
1168 | 1729 int num_ref_idx_active_override_flag; |
7332 | 1730 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
|
1731 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
|
1732 int last_pic_structure; |
1168 | 1733 |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1734 s->dropable= h->nal_ref_idc == 0; |
1168 | 1735 |
5984
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
1736 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
|
1737 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
|
1738 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
|
1739 }else{ |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
1740 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
|
1741 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
|
1742 } |
ba13cc3e38bb
Initialize function pointers used by error resilience code before any
heydowns
parents:
5963
diff
changeset
|
1743 |
1168 | 1744 first_mb_in_slice= get_ue_golomb(&s->gb); |
1745 | |
9419 | 1746 if(first_mb_in_slice == 0){ //FIXME better field boundary detection |
1747 if(h0->current_slice && FIELD_PICTURE){ | |
1748 field_end(h); | |
1749 } | |
1750 | |
5642 | 1751 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
|
1752 if (!s0->first_field) |
5803 | 1753 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
|
1754 } |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
1755 |
8451
384600e3fe5b
Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents:
8448
diff
changeset
|
1756 slice_type= get_ue_golomb_31(&s->gb); |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
1757 if(slice_type > 9){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1758 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 | 1759 return -1; |
1168 | 1760 } |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
1761 if(slice_type > 4){ |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
1762 slice_type -= 5; |
1168 | 1763 h->slice_type_fixed=1; |
1764 }else | |
1765 h->slice_type_fixed=0; | |
2967 | 1766 |
8206
5f399949a6a6
Use golomb_to_pict_type instead of its duplicate, slice_type_map.
diego
parents:
8140
diff
changeset
|
1767 slice_type= golomb_to_pict_type[ slice_type ]; |
6481 | 1768 if (slice_type == FF_I_TYPE |
5642 | 1769 || (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
|
1770 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
|
1771 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
1772 h->slice_type= slice_type; |
7338 | 1773 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
|
1774 |
7374 | 1775 s->pict_type= h->slice_type; // to make a few old functions happy, it's wrong though |
2967 | 1776 |
1168 | 1777 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
|
1778 if(pps_id>=MAX_PPS_COUNT){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1779 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 1780 return -1; |
1781 } | |
5642 | 1782 if(!h0->pps_buffers[pps_id]) { |
9112
79818b0595c0
When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents:
9108
diff
changeset
|
1783 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS %u referenced\n", pps_id); |
1174 | 1784 return -1; |
1785 } | |
5642 | 1786 h->pps= *h0->pps_buffers[pps_id]; |
1787 | |
1788 if(!h0->sps_buffers[h->pps.sps_id]) { | |
9112
79818b0595c0
When a H.264 stream references a PPS or SPS id which doesn't exist, instead of
takis
parents:
9108
diff
changeset
|
1789 av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", h->pps.sps_id); |
1174 | 1790 return -1; |
1791 } | |
5642 | 1792 h->sps = *h0->sps_buffers[h->pps.sps_id]; |
2919 | 1793 |
11633
d47bd24cb380
H.264: move avctx->{profile,level} init before AVCodecContext.get_format().
gb
parents:
11632
diff
changeset
|
1794 s->avctx->profile = h->sps.profile_idc; |
d47bd24cb380
H.264: move avctx->{profile,level} init before AVCodecContext.get_format().
gb
parents:
11632
diff
changeset
|
1795 s->avctx->level = h->sps.level_idc; |
11634 | 1796 s->avctx->refs = h->sps.ref_frame_count; |
11632
9a5c269f31f5
H.264: move avctx->refs init before AVCodecContext.get_format().
gb
parents:
11627
diff
changeset
|
1797 |
5685
070a376d496b
fix image corruption when with multi-threaded decoding.
gpoirier
parents:
5647
diff
changeset
|
1798 if(h == h0 && h->dequant_coeff_pps != pps_id){ |
4363 | 1799 h->dequant_coeff_pps = pps_id; |
2919 | 1800 init_dequant_tables(h); |
1801 } | |
2967 | 1802 |
1168 | 1803 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
|
1804 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
2967 | 1805 |
3178 | 1806 h->b_stride= s->mb_width*4; |
1168 | 1807 |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
1808 s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7); |
1168 | 1809 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
|
1810 s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7); |
1168 | 1811 else |
6581
e6d8c5bbeeac
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
michael
parents:
6524
diff
changeset
|
1812 s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3); |
2967 | 1813 |
1814 if (s->context_initialized | |
11509
9adad5749f23
Reinitialize the h264 decoder context on every valid aspect ratio
stefano
parents:
11499
diff
changeset
|
1815 && ( s->width != s->avctx->width || s->height != s->avctx->height |
9adad5749f23
Reinitialize the h264 decoder context on every valid aspect ratio
stefano
parents:
11499
diff
changeset
|
1816 || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { |
5642 | 1817 if(h != h0) |
1818 return -1; // width / height changed during parallelized decoding | |
1168 | 1819 free_tables(h); |
8231
0df3402e6b41
Fix segfault due to deallocated entries in delayed_pic after size change.
michael
parents:
8216
diff
changeset
|
1820 flush_dpb(s->avctx); |
1168 | 1821 MPV_common_end(s); |
1822 } | |
1823 if (!s->context_initialized) { | |
5642 | 1824 if(h != h0) |
1825 return -1; // we cant (re-)initialize context during parallel decoding | |
10565
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1826 |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1827 avcodec_set_dimensions(s->avctx, s->width, s->height); |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1828 s->avctx->sample_aspect_ratio= h->sps.sar; |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1829 if(!s->avctx->sample_aspect_ratio.den) |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1830 s->avctx->sample_aspect_ratio.den = 1; |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1831 |
10837
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1832 if(h->sps.video_signal_type_present_flag){ |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1833 s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1834 if(h->sps.colour_description_present_flag){ |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1835 s->avctx->color_primaries = h->sps.color_primaries; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1836 s->avctx->color_trc = h->sps.color_trc; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1837 s->avctx->colorspace = h->sps.colorspace; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1838 } |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1839 } |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
1840 |
10565
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1841 if(h->sps.timing_info_present_flag){ |
11076 | 1842 int64_t den= h->sps.time_scale; |
11097 | 1843 if(h->x264_build < 44U) |
11076 | 1844 den *= 2; |
10565
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1845 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den, |
11076 | 1846 h->sps.num_units_in_tick, den, 1<<30); |
10565
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1847 } |
11795
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
1848 s->avctx->pix_fmt = s->avctx->get_format(s->avctx, |
11800
966aa6b53dcf
Pass codec pixel format list to get_format, if present, fix vdpau decoding
bcoudurier
parents:
11795
diff
changeset
|
1849 s->avctx->codec->pix_fmts ? |
966aa6b53dcf
Pass codec pixel format list to get_format, if present, fix vdpau decoding
bcoudurier
parents:
11795
diff
changeset
|
1850 s->avctx->codec->pix_fmts : |
11795
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
1851 s->avctx->color_range == AVCOL_RANGE_JPEG ? |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
1852 hwaccel_pixfmt_list_h264_jpeg_420 : |
cb40fa41b796
In h264 decoder, use jpeg yuv pixel format when full range is set in vui
bcoudurier
parents:
11777
diff
changeset
|
1853 ff_hwaccel_pixfmt_list_420); |
10565
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1854 s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt); |
26dc0444fa93
Call ff_find_hwaccel() after calling avcodec_set_dimensions().
cehoyos
parents:
10560
diff
changeset
|
1855 |
1168 | 1856 if (MPV_common_init(s) < 0) |
1857 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
|
1858 s->first_field = 0; |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
1859 h->prev_interlaced_frame = 1; |
2967 | 1860 |
5160
13386224ff72
Factor out init_scan_tables(), patch by Andreas man %andreas A olebyn.nu%
gpoirier
parents:
5153
diff
changeset
|
1861 init_scan_tables(h); |
10852 | 1862 ff_h264_alloc_tables(h); |
1168 | 1863 |
5642 | 1864 for(i = 1; i < s->avctx->thread_count; i++) { |
1865 H264Context *c; | |
1866 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
|
1867 memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext)); |
5642 | 1868 memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext)); |
11562
66f3d2ff88b7
H264: Copy h264dsp when creating new slice threads
astrange
parents:
11560
diff
changeset
|
1869 c->h264dsp = h->h264dsp; |
5642 | 1870 c->sps = h->sps; |
1871 c->pps = h->pps; | |
1872 init_scan_tables(c); | |
11330
e8e5dbbbf9c4
Fix a bunch of bugs ive introduced recently that broke threaded decoding.
michael
parents:
11326
diff
changeset
|
1873 clone_tables(c, h, i); |
5642 | 1874 } |
1875 | |
1876 for(i = 0; i < s->avctx->thread_count; i++) | |
1877 if(context_init(h->thread_context[i]) < 0) | |
1878 return -1; | |
1168 | 1879 } |
1880 | |
1881 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); | |
1882 | |
3316 | 1883 h->mb_mbaff = 0; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1884 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
|
1885 last_pic_structure = s0->picture_structure; |
1168 | 1886 if(h->sps.frame_mbs_only_flag){ |
1887 s->picture_structure= PICT_FRAME; | |
1888 }else{ | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1889 if(get_bits1(&s->gb)) { //field_pic_flag |
1168 | 1890 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
|
1891 } else { |
1168 | 1892 s->picture_structure= PICT_FRAME; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1893 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
|
1894 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1895 } |
7468 | 1896 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
|
1897 |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
1898 if(h0->current_slice == 0){ |
7350 | 1899 while(h->frame_num != h->prev_frame_num && |
1900 h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){ | |
12083 | 1901 av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); |
10852 | 1902 if (ff_h264_frame_start(h) < 0) |
9004
aae80543bc6e
Check return value of frame_start(), this avoids a crash if AVCodecContext::get_buffer failed.
reimar
parents:
8996
diff
changeset
|
1903 return -1; |
7350 | 1904 h->prev_frame_num++; |
1905 h->prev_frame_num %= 1<<h->sps.log2_max_frame_num; | |
1906 s->current_picture_ptr->frame_num= h->prev_frame_num; | |
12094
f7bedc1ce1bc
Perform sliding window operation during frame gap handling.
michael
parents:
12083
diff
changeset
|
1907 ff_generate_sliding_window_mmcos(h); |
f7bedc1ce1bc
Perform sliding window operation during frame gap handling.
michael
parents:
12083
diff
changeset
|
1908 ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); |
12525 | 1909 /* Error concealment: if a ref is missing, copy the previous ref in its place. |
1910 * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions | |
1911 * about there being no actual duplicates. | |
1912 * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're | |
1913 * concealing a lost frame, this probably isn't noticable by comparison, but it should | |
1914 * be fixed. */ | |
1915 av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, | |
1916 (const uint8_t**)h->short_ref[1]->data, h->short_ref[1]->linesize, | |
1917 PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); | |
1918 h->short_ref[0]->frame_num = h->prev_frame_num; | |
1919 h->short_ref[0]->poc = h->short_ref[1]->poc+2; | |
7350 | 1920 } |
1921 | |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1922 /* 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
|
1923 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
|
1924 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
|
1925 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
|
1926 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
|
1927 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1928 /* 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
|
1929 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
|
1930 /* |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1931 * 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
|
1932 * 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
|
1933 */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1934 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
|
1935 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
|
1936 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1937 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1938 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
|
1939 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
|
1940 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
|
1941 /* |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1942 * 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
|
1943 * 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
|
1944 * 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
|
1945 * purposes. |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1946 */ |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1947 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
|
1948 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
|
1949 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1950 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1951 /* 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
|
1952 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
|
1953 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1954 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1955 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1956 } else { |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1957 /* 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
|
1958 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
|
1959 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
|
1960 } |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1961 |
10852 | 1962 if((!FIELD_PICTURE || s0->first_field) && ff_h264_frame_start(h) < 0) { |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
1963 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
|
1964 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
|
1965 } |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
1966 } |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
1967 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
|
1968 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
|
1969 |
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
1970 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
|
1971 |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
1972 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
|
1973 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
|
1974 first_mb_in_slice >= s->mb_num){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
1975 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
|
1976 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
1977 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1978 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
|
1979 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
|
1980 if (s->picture_structure == PICT_BOTTOM_FIELD) |
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
1981 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
|
1982 assert(s->mb_y < s->mb_height); |
2967 | 1983 |
1168 | 1984 if(s->picture_structure==PICT_FRAME){ |
1985 h->curr_pic_num= h->frame_num; | |
1986 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
1987 }else{ | |
5772
65b71bd21a4d
Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
andoma
parents:
5771
diff
changeset
|
1988 h->curr_pic_num= 2*h->frame_num + 1; |
1168 | 1989 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); |
1990 } | |
2967 | 1991 |
1168 | 1992 if(h->nal_unit_type == NAL_IDR_SLICE){ |
1453 | 1993 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 1994 } |
2967 | 1995 |
1168 | 1996 if(h->sps.poc_type==0){ |
1997 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
2967 | 1998 |
1168 | 1999 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ |
2000 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
2001 } | |
2002 } | |
2967 | 2003 |
1168 | 2004 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ |
2005 h->delta_poc[0]= get_se_golomb(&s->gb); | |
2967 | 2006 |
1168 | 2007 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) |
2008 h->delta_poc[1]= get_se_golomb(&s->gb); | |
2009 } | |
2967 | 2010 |
1168 | 2011 init_poc(h); |
2967 | 2012 |
1168 | 2013 if(h->pps.redundant_pic_cnt_present){ |
2014 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
2015 } | |
2016 | |
7374 | 2017 //set defaults, might be overridden a few lines later |
1168 | 2018 h->ref_count[0]= h->pps.ref_count[0]; |
2019 h->ref_count[1]= h->pps.ref_count[1]; | |
2020 | |
7338 | 2021 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
|
2022 if(h->slice_type_nos == FF_B_TYPE){ |
1168 | 2023 h->direct_spatial_mv_pred= get_bits1(&s->gb); |
2024 } | |
2025 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
2967 | 2026 |
1168 | 2027 if(num_ref_idx_active_override_flag){ |
2028 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
|
2029 if(h->slice_type_nos==FF_B_TYPE) |
1168 | 2030 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; |
2031 | |
4532 | 2032 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
|
2033 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
|
2034 h->ref_count[0]= h->ref_count[1]= 1; |
1168 | 2035 return -1; |
2036 } | |
2037 } | |
7341
b75aa0197be4
Use slice_type_nos instead of slice_type where it makes no difference.
michael
parents:
7340
diff
changeset
|
2038 if(h->slice_type_nos == FF_B_TYPE) |
4532 | 2039 h->list_count= 2; |
2040 else | |
2041 h->list_count= 1; | |
2042 }else | |
2043 h->list_count= 0; | |
1168 | 2044 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
2045 if(!default_ref_list_done){ |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
2046 ff_h264_fill_default_ref_list(h); |
1168 | 2047 } |
2048 | |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
2049 if(h->slice_type_nos!=FF_I_TYPE && ff_h264_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
|
2050 return -1; |
1168 | 2051 |
7921
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2052 if(h->slice_type_nos!=FF_I_TYPE){ |
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2053 s->last_picture_ptr= &h->ref_list[0][0]; |
7974 | 2054 ff_copy_picture(&s->last_picture, s->last_picture_ptr); |
7921
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2055 } |
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2056 if(h->slice_type_nos==FF_B_TYPE){ |
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2057 s->next_picture_ptr= &h->ref_list[1][0]; |
7974 | 2058 ff_copy_picture(&s->next_picture, s->next_picture_ptr); |
7921
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2059 } |
44570b9b3aa1
Initialize next/last_picture* as the generic code does not always
michael
parents:
7920
diff
changeset
|
2060 |
7339 | 2061 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
|
2062 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) ) |
1168 | 2063 pred_weight_table(h); |
11345 | 2064 else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE){ |
11558 | 2065 implicit_weight_table(h, -1); |
11345 | 2066 }else { |
2415 | 2067 h->use_weight = 0; |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
2068 for (i = 0; i < 2; i++) { |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
2069 h->luma_weight_flag[i] = 0; |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
2070 h->chroma_weight_flag[i] = 0; |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
2071 } |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8727
diff
changeset
|
2072 } |
2967 | 2073 |
5723
49a5d44423ef
h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents:
5713
diff
changeset
|
2074 if(h->nal_ref_idc) |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
2075 ff_h264_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
|
2076 |
11558 | 2077 if(FRAME_MBAFF){ |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
2078 ff_h264_fill_mbaff_ref_list(h); |
3316 | 2079 |
11558 | 2080 if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE){ |
2081 implicit_weight_table(h, 0); | |
2082 implicit_weight_table(h, 1); | |
2083 } | |
2084 } | |
2085 | |
7897
004f3c69fe7b
Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents:
7896
diff
changeset
|
2086 if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred) |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
2087 ff_h264_direct_dist_scale_factor(h); |
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
2088 ff_h264_direct_ref_list_init(h); |
7897
004f3c69fe7b
Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
michael
parents:
7896
diff
changeset
|
2089 |
7338 | 2090 if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){ |
8451
384600e3fe5b
Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents:
8448
diff
changeset
|
2091 tmp = get_ue_golomb_31(&s->gb); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2092 if(tmp > 2){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2093 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
|
2094 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2095 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2096 h->cabac_init_idc= tmp; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2097 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2098 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2099 h->last_qscale_diff = 0; |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2100 tmp = h->pps.init_qp + get_se_golomb(&s->gb); |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2101 if(tmp>51){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2102 av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); |
1898 | 2103 return -1; |
2104 } | |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2105 s->qscale= tmp; |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
2106 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
|
2107 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale); |
1168 | 2108 //FIXME qscale / qp ... stuff |
6481 | 2109 if(h->slice_type == FF_SP_TYPE){ |
1453 | 2110 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 2111 } |
6481 | 2112 if(h->slice_type==FF_SP_TYPE || h->slice_type == FF_SI_TYPE){ |
1453 | 2113 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 2114 } |
2115 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2116 h->deblocking_filter = 1; |
10979
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2117 h->slice_alpha_c0_offset = 52; |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2118 h->slice_beta_offset = 52; |
1168 | 2119 if( h->pps.deblocking_filter_parameters_present ) { |
8451
384600e3fe5b
Use get_ue_golomb_31() where possible, almost all are just in headers
michael
parents:
8448
diff
changeset
|
2120 tmp= get_ue_golomb_31(&s->gb); |
4365
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2121 if(tmp > 2){ |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2122 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
|
2123 return -1; |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2124 } |
9cebff821565
checking bitstream values and other related changes
michael
parents:
4364
diff
changeset
|
2125 h->deblocking_filter= tmp; |
2967 | 2126 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
|
2127 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
|
2128 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2129 if( h->deblocking_filter ) { |
10979
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2130 h->slice_alpha_c0_offset += get_se_golomb(&s->gb) << 1; |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2131 h->slice_beta_offset += get_se_golomb(&s->gb) << 1; |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2132 if( h->slice_alpha_c0_offset > 104U |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2133 || h->slice_beta_offset > 104U){ |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2134 av_log(s->avctx, AV_LOG_ERROR, "deblocking filter parameters %d %d out of range\n", h->slice_alpha_c0_offset, h->slice_beta_offset); |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2135 return -1; |
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2136 } |
1168 | 2137 } |
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
|
2138 } |
5642 | 2139 |
5698
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
2140 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
7340 | 2141 ||(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
|
2142 ||(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
|
2143 ||(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
|
2144 h->deblocking_filter= 0; |
9a26cb6747a9
Apply skip_loop_filter before checking if we can parallelize with the selected
reimar
parents:
5694
diff
changeset
|
2145 |
5642 | 2146 if(h->deblocking_filter == 1 && h0->max_contexts > 1) { |
5646 | 2147 if(s->avctx->flags2 & CODEC_FLAG2_FAST) { |
2148 /* Cheat slightly for speed: | |
6029 | 2149 Do not bother to deblock across slices. */ |
5646 | 2150 h->deblocking_filter = 2; |
2151 } else { | |
5647 | 2152 h0->max_contexts = 1; |
2153 if(!h0->single_decode_warning) { | |
2154 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); | |
2155 h0->single_decode_warning = 1; | |
2156 } | |
2157 if(h != h0) | |
2158 return 1; // deblocking switched inside frame | |
5646 | 2159 } |
5642 | 2160 } |
10979
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2161 h->qp_thresh= 15 + 52 - FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]); |
5642 | 2162 |
1168 | 2163 #if 0 //FMO |
2164 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
2165 slice_group_change_cycle= get_bits(&s->gb, ?); | |
2166 #endif | |
2167 | |
5642 | 2168 h0->last_slice_type = slice_type; |
2169 h->slice_num = ++h0->current_slice; | |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8042
diff
changeset
|
2170 if(h->slice_num >= MAX_SLICES){ |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8042
diff
changeset
|
2171 av_log(s->avctx, AV_LOG_ERROR, "Too many slices, increase MAX_SLICES and recompile\n"); |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8042
diff
changeset
|
2172 } |
2392 | 2173 |
7343 | 2174 for(j=0; j<2; j++){ |
10913
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2175 int id_list[16]; |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8042
diff
changeset
|
2176 int *ref2frm= h->ref2frm[h->slice_num&(MAX_SLICES-1)][j]; |
10913
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2177 for(i=0; i<16; i++){ |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2178 id_list[i]= 60; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2179 if(h->ref_list[j][i].data[0]){ |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2180 int k; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2181 uint8_t *base= h->ref_list[j][i].base[0]; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2182 for(k=0; k<h->short_ref_count; k++) |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2183 if(h->short_ref[k]->base[0] == base){ |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2184 id_list[i]= k; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2185 break; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2186 } |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2187 for(k=0; k<h->long_ref_count; k++) |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2188 if(h->long_ref[k] && h->long_ref[k]->base[0] == base){ |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2189 id_list[i]= h->short_ref_count + k; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2190 break; |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2191 } |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2192 } |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2193 } |
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2194 |
7343 | 2195 ref2frm[0]= |
2196 ref2frm[1]= -1; | |
7526
3749f13a0d02
Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents:
7525
diff
changeset
|
2197 for(i=0; i<16; i++) |
10913
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2198 ref2frm[i+2]= 4*id_list[i] |
7343 | 2199 +(h->ref_list[j][i].reference&3); |
7526
3749f13a0d02
Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents:
7525
diff
changeset
|
2200 ref2frm[18+0]= |
3749f13a0d02
Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents:
7525
diff
changeset
|
2201 ref2frm[18+1]= -1; |
3749f13a0d02
Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents:
7525
diff
changeset
|
2202 for(i=16; i<48; i++) |
10913
497929e9d912
Perform reference remapping at fill_cache() time instead of in the
michael
parents:
10910
diff
changeset
|
2203 ref2frm[i+4]= 4*id_list[(i-16)>>1] |
7526
3749f13a0d02
Use the correct reference tables for interlaced MBAFF MBs in the loop filter.
michael
parents:
7525
diff
changeset
|
2204 +(h->ref_list[j][i].reference&3); |
7343 | 2205 } |
2206 | |
3316 | 2207 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
|
2208 h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; |
3316 | 2209 |
1168 | 2210 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
7920
b731ef917a01
Print which slices are IDR not just the slice type.
michael
parents:
7919
diff
changeset
|
2211 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s 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
|
2212 h->slice_num, |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2213 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
2967 | 2214 first_mb_in_slice, |
7920
b731ef917a01
Print which slices are IDR not just the slice type.
michael
parents:
7919
diff
changeset
|
2215 av_get_pict_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", |
1168 | 2216 pps_id, h->frame_num, |
2217 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
2218 h->ref_count[0], h->ref_count[1], | |
2219 s->qscale, | |
10979
776dba50775c
Move +52 from the loop filter to the alpha/beta offsets in the context.
michael
parents:
10930
diff
changeset
|
2220 h->deblocking_filter, h->slice_alpha_c0_offset/2-26, h->slice_beta_offset/2-26, |
2415 | 2221 h->use_weight, |
6890 | 2222 h->use_weight==1 && h->use_weight_chroma ? "c" : "", |
2223 h->slice_type == FF_B_TYPE ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : "" | |
1168 | 2224 ); |
2225 } | |
2226 | |
2227 return 0; | |
2228 } | |
2229 | |
10987
85de0c8a19b7
Added a missing const to ff_h264_get_slice_type().
fenrir
parents:
10984
diff
changeset
|
2230 int ff_h264_get_slice_type(const H264Context *h) |
10829
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2231 { |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2232 switch (h->slice_type) { |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2233 case FF_P_TYPE: return 0; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2234 case FF_B_TYPE: return 1; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2235 case FF_I_TYPE: return 2; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2236 case FF_SP_TYPE: return 3; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2237 case FF_SI_TYPE: return 4; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2238 default: return -1; |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2239 } |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2240 } |
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
10826
diff
changeset
|
2241 |
11627
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2242 /** |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2243 * |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2244 * @return non zero if the loop filter can be skiped |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2245 */ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2246 static int fill_filter_caches(H264Context *h, int mb_type){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2247 MpegEncContext * const s = &h->s; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2248 const int mb_xy= h->mb_xy; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2249 int top_xy, left_xy[2]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2250 int top_type, left_type[2]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2251 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2252 top_xy = mb_xy - (s->mb_stride << MB_FIELD); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2253 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2254 //FIXME deblocking could skip the intra and nnz parts. |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2255 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2256 /* Wow, what a mess, why didn't they simplify the interlacing & intra |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2257 * stuff, I can't imagine that these complex rules are worth it. */ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2258 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2259 left_xy[1] = left_xy[0] = mb_xy-1; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2260 if(FRAME_MBAFF){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2261 const int left_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2262 const int curr_mb_field_flag = IS_INTERLACED(mb_type); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2263 if(s->mb_y&1){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2264 if (left_mb_field_flag != curr_mb_field_flag) { |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2265 left_xy[0] -= s->mb_stride; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2266 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2267 }else{ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2268 if(curr_mb_field_flag){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2269 top_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy ]>>7)&1)-1); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2270 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2271 if (left_mb_field_flag != curr_mb_field_flag) { |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2272 left_xy[1] += s->mb_stride; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2273 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2274 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2275 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2276 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2277 h->top_mb_xy = top_xy; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2278 h->left_mb_xy[0] = left_xy[0]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2279 h->left_mb_xy[1] = left_xy[1]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2280 { |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2281 //for sufficiently low qp, filtering wouldn't do anything |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2282 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2283 int qp_thresh = h->qp_thresh; //FIXME strictly we should store qp_thresh for each mb of a slice |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2284 int qp = s->current_picture.qscale_table[mb_xy]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2285 if(qp <= qp_thresh |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2286 && (left_xy[0]<0 || ((qp + s->current_picture.qscale_table[left_xy[0]] + 1)>>1) <= qp_thresh) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2287 && (top_xy < 0 || ((qp + s->current_picture.qscale_table[top_xy ] + 1)>>1) <= qp_thresh)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2288 if(!FRAME_MBAFF) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2289 return 1; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2290 if( (left_xy[0]< 0 || ((qp + s->current_picture.qscale_table[left_xy[1] ] + 1)>>1) <= qp_thresh) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2291 && (top_xy < s->mb_stride || ((qp + s->current_picture.qscale_table[top_xy -s->mb_stride] + 1)>>1) <= qp_thresh)) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2292 return 1; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2293 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2294 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2295 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2296 top_type = s->current_picture.mb_type[top_xy] ; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2297 left_type[0] = s->current_picture.mb_type[left_xy[0]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2298 left_type[1] = s->current_picture.mb_type[left_xy[1]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2299 if(h->deblocking_filter == 2){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2300 if(h->slice_table[top_xy ] != h->slice_num) top_type= 0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2301 if(h->slice_table[left_xy[0] ] != h->slice_num) left_type[0]= left_type[1]= 0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2302 }else{ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2303 if(h->slice_table[top_xy ] == 0xFFFF) top_type= 0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2304 if(h->slice_table[left_xy[0] ] == 0xFFFF) left_type[0]= left_type[1] =0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2305 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2306 h->top_type = top_type ; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2307 h->left_type[0]= left_type[0]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2308 h->left_type[1]= left_type[1]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2309 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2310 if(IS_INTRA(mb_type)) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2311 return 0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2312 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2313 AV_COPY64(&h->non_zero_count_cache[0+8*1], &h->non_zero_count[mb_xy][ 0]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2314 AV_COPY64(&h->non_zero_count_cache[0+8*2], &h->non_zero_count[mb_xy][ 8]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2315 AV_COPY32(&h->non_zero_count_cache[0+8*5], &h->non_zero_count[mb_xy][16]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2316 AV_COPY32(&h->non_zero_count_cache[4+8*3], &h->non_zero_count[mb_xy][20]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2317 AV_COPY64(&h->non_zero_count_cache[0+8*4], &h->non_zero_count[mb_xy][24]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2318 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2319 h->cbp= h->cbp_table[mb_xy]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2320 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2321 { |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2322 int list; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2323 for(list=0; list<h->list_count; list++){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2324 int8_t *ref; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2325 int y, b_stride; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2326 int16_t (*mv_dst)[2]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2327 int16_t (*mv_src)[2]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2328 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2329 if(!USES_LIST(mb_type, list)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2330 fill_rectangle( h->mv_cache[list][scan8[0]], 4, 4, 8, pack16to32(0,0), 4); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2331 AV_WN32A(&h->ref_cache[list][scan8[ 0]], ((LIST_NOT_USED)&0xFF)*0x01010101u); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2332 AV_WN32A(&h->ref_cache[list][scan8[ 2]], ((LIST_NOT_USED)&0xFF)*0x01010101u); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2333 AV_WN32A(&h->ref_cache[list][scan8[ 8]], ((LIST_NOT_USED)&0xFF)*0x01010101u); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2334 AV_WN32A(&h->ref_cache[list][scan8[10]], ((LIST_NOT_USED)&0xFF)*0x01010101u); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2335 continue; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2336 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2337 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2338 ref = &s->current_picture.ref_index[list][4*mb_xy]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2339 { |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2340 int (*ref2frm)[64] = h->ref2frm[ h->slice_num&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2341 AV_WN32A(&h->ref_cache[list][scan8[ 0]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2342 AV_WN32A(&h->ref_cache[list][scan8[ 2]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2343 ref += 2; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2344 AV_WN32A(&h->ref_cache[list][scan8[ 8]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2345 AV_WN32A(&h->ref_cache[list][scan8[10]], (pack16to32(ref2frm[list][ref[0]],ref2frm[list][ref[1]])&0x00FF00FF)*0x0101); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2346 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2347 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2348 b_stride = h->b_stride; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2349 mv_dst = &h->mv_cache[list][scan8[0]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2350 mv_src = &s->current_picture.motion_val[list][4*s->mb_x + 4*s->mb_y*b_stride]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2351 for(y=0; y<4; y++){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2352 AV_COPY128(mv_dst + 8*y, mv_src + y*b_stride); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2353 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2354 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2355 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2356 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2357 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2358 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2359 /* |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2360 0 . T T. T T T T |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2361 1 L . .L . . . . |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2362 2 L . .L . . . . |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2363 3 . T TL . . . . |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2364 4 L . .L . . . . |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2365 5 L . .. . . . . |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2366 */ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2367 //FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec) |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2368 if(top_type){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2369 AV_COPY32(&h->non_zero_count_cache[4+8*0], &h->non_zero_count[top_xy][4+3*8]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2370 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2371 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2372 if(left_type[0]){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2373 h->non_zero_count_cache[3+8*1]= h->non_zero_count[left_xy[0]][7+0*8]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2374 h->non_zero_count_cache[3+8*2]= h->non_zero_count[left_xy[0]][7+1*8]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2375 h->non_zero_count_cache[3+8*3]= h->non_zero_count[left_xy[0]][7+2*8]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2376 h->non_zero_count_cache[3+8*4]= h->non_zero_count[left_xy[0]][7+3*8]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2377 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2378 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2379 // CAVLC 8x8dct requires NNZ values for residual decoding that differ from what the loop filter needs |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2380 if(!CABAC && h->pps.transform_8x8_mode){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2381 if(IS_8x8DCT(top_type)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2382 h->non_zero_count_cache[4+8*0]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2383 h->non_zero_count_cache[5+8*0]= h->cbp_table[top_xy] & 4; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2384 h->non_zero_count_cache[6+8*0]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2385 h->non_zero_count_cache[7+8*0]= h->cbp_table[top_xy] & 8; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2386 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2387 if(IS_8x8DCT(left_type[0])){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2388 h->non_zero_count_cache[3+8*1]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2389 h->non_zero_count_cache[3+8*2]= h->cbp_table[left_xy[0]]&2; //FIXME check MBAFF |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2390 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2391 if(IS_8x8DCT(left_type[1])){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2392 h->non_zero_count_cache[3+8*3]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2393 h->non_zero_count_cache[3+8*4]= h->cbp_table[left_xy[1]]&8; //FIXME check MBAFF |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2394 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2395 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2396 if(IS_8x8DCT(mb_type)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2397 h->non_zero_count_cache[scan8[0 ]]= h->non_zero_count_cache[scan8[1 ]]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2398 h->non_zero_count_cache[scan8[2 ]]= h->non_zero_count_cache[scan8[3 ]]= h->cbp & 1; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2399 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2400 h->non_zero_count_cache[scan8[0+ 4]]= h->non_zero_count_cache[scan8[1+ 4]]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2401 h->non_zero_count_cache[scan8[2+ 4]]= h->non_zero_count_cache[scan8[3+ 4]]= h->cbp & 2; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2402 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2403 h->non_zero_count_cache[scan8[0+ 8]]= h->non_zero_count_cache[scan8[1+ 8]]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2404 h->non_zero_count_cache[scan8[2+ 8]]= h->non_zero_count_cache[scan8[3+ 8]]= h->cbp & 4; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2405 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2406 h->non_zero_count_cache[scan8[0+12]]= h->non_zero_count_cache[scan8[1+12]]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2407 h->non_zero_count_cache[scan8[2+12]]= h->non_zero_count_cache[scan8[3+12]]= h->cbp & 8; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2408 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2409 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2410 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2411 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2412 int list; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2413 for(list=0; list<h->list_count; list++){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2414 if(USES_LIST(top_type, list)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2415 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2416 const int b8_xy= 4*top_xy + 2; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2417 int (*ref2frm)[64] = h->ref2frm[ h->slice_table[top_xy]&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2418 AV_COPY128(h->mv_cache[list][scan8[0] + 0 - 1*8], s->current_picture.motion_val[list][b_xy + 0]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2419 h->ref_cache[list][scan8[0] + 0 - 1*8]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2420 h->ref_cache[list][scan8[0] + 1 - 1*8]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 0]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2421 h->ref_cache[list][scan8[0] + 2 - 1*8]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2422 h->ref_cache[list][scan8[0] + 3 - 1*8]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 1]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2423 }else{ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2424 AV_ZERO128(h->mv_cache[list][scan8[0] + 0 - 1*8]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2425 AV_WN32A(&h->ref_cache[list][scan8[0] + 0 - 1*8], ((LIST_NOT_USED)&0xFF)*0x01010101u); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2426 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2427 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2428 if(!IS_INTERLACED(mb_type^left_type[0])){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2429 if(USES_LIST(left_type[0], list)){ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2430 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2431 const int b8_xy= 4*left_xy[0] + 1; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2432 int (*ref2frm)[64] = h->ref2frm[ h->slice_table[left_xy[0]]&(MAX_SLICES-1) ][0] + (MB_MBAFF ? 20 : 2); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2433 AV_COPY32(h->mv_cache[list][scan8[0] - 1 + 0 ], s->current_picture.motion_val[list][b_xy + h->b_stride*0]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2434 AV_COPY32(h->mv_cache[list][scan8[0] - 1 + 8 ], s->current_picture.motion_val[list][b_xy + h->b_stride*1]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2435 AV_COPY32(h->mv_cache[list][scan8[0] - 1 +16 ], s->current_picture.motion_val[list][b_xy + h->b_stride*2]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2436 AV_COPY32(h->mv_cache[list][scan8[0] - 1 +24 ], s->current_picture.motion_val[list][b_xy + h->b_stride*3]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2437 h->ref_cache[list][scan8[0] - 1 + 0 ]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2438 h->ref_cache[list][scan8[0] - 1 + 8 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 2*0]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2439 h->ref_cache[list][scan8[0] - 1 +16 ]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2440 h->ref_cache[list][scan8[0] - 1 +24 ]= ref2frm[list][s->current_picture.ref_index[list][b8_xy + 2*1]]; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2441 }else{ |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2442 AV_ZERO32(h->mv_cache [list][scan8[0] - 1 + 0 ]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2443 AV_ZERO32(h->mv_cache [list][scan8[0] - 1 + 8 ]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2444 AV_ZERO32(h->mv_cache [list][scan8[0] - 1 +16 ]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2445 AV_ZERO32(h->mv_cache [list][scan8[0] - 1 +24 ]); |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2446 h->ref_cache[list][scan8[0] - 1 + 0 ]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2447 h->ref_cache[list][scan8[0] - 1 + 8 ]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2448 h->ref_cache[list][scan8[0] - 1 + 16 ]= |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2449 h->ref_cache[list][scan8[0] - 1 + 24 ]= LIST_NOT_USED; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2450 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2451 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2452 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2453 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2454 |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2455 return 0; |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2456 } |
56591b8041ea
Move static function fill_filter_caches() from h264.h to h264.c.
diego
parents:
11562
diff
changeset
|
2457 |
10906 | 2458 static void loop_filter(H264Context *h){ |
2459 MpegEncContext * const s = &h->s; | |
2460 uint8_t *dest_y, *dest_cb, *dest_cr; | |
2461 int linesize, uvlinesize, mb_x, mb_y; | |
2462 const int end_mb_y= s->mb_y + FRAME_MBAFF; | |
2463 const int old_slice_type= h->slice_type; | |
2464 | |
2465 if(h->deblocking_filter) { | |
2466 for(mb_x= 0; mb_x<s->mb_width; mb_x++){ | |
2467 for(mb_y=end_mb_y - FRAME_MBAFF; mb_y<= end_mb_y; mb_y++){ | |
11162 | 2468 int mb_xy, mb_type; |
10906 | 2469 mb_xy = h->mb_xy = mb_x + mb_y*s->mb_stride; |
2470 h->slice_num= h->slice_table[mb_xy]; | |
2471 mb_type= s->current_picture.mb_type[mb_xy]; | |
2472 h->list_count= h->list_counts[mb_xy]; | |
2473 | |
2474 if(FRAME_MBAFF) | |
2475 h->mb_mbaff = h->mb_field_decoding_flag = !!IS_INTERLACED(mb_type); | |
2476 | |
2477 s->mb_x= mb_x; | |
2478 s->mb_y= mb_y; | |
2479 dest_y = s->current_picture.data[0] + (mb_x + mb_y * s->linesize ) * 16; | |
2480 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8; | |
2481 dest_cr = s->current_picture.data[2] + (mb_x + mb_y * s->uvlinesize) * 8; | |
2482 //FIXME simplify above | |
2483 | |
2484 if (MB_FIELD) { | |
2485 linesize = h->mb_linesize = s->linesize * 2; | |
2486 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2; | |
2487 if(mb_y&1){ //FIXME move out of this function? | |
2488 dest_y -= s->linesize*15; | |
2489 dest_cb-= s->uvlinesize*7; | |
2490 dest_cr-= s->uvlinesize*7; | |
2491 } | |
2492 } else { | |
2493 linesize = h->mb_linesize = s->linesize; | |
2494 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
2495 } | |
10989
79f2e73f3714
Remove is_complex from loop_filter() its useless there in its current form.
michael
parents:
10987
diff
changeset
|
2496 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
11011
aa5bcf07731a
100l typo fix, mixed up +-1 forcing the loop filter skip to never skip.
michael
parents:
11003
diff
changeset
|
2497 if(fill_filter_caches(h, mb_type)) |
10910 | 2498 continue; |
10906 | 2499 h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); |
2500 h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); | |
2501 | |
10989
79f2e73f3714
Remove is_complex from loop_filter() its useless there in its current form.
michael
parents:
10987
diff
changeset
|
2502 if (FRAME_MBAFF) { |
10906 | 2503 ff_h264_filter_mb (h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
2504 } else { | |
2505 ff_h264_filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); | |
2506 } | |
2507 } | |
2508 } | |
2509 } | |
2510 h->slice_type= old_slice_type; | |
2511 s->mb_x= 0; | |
2512 s->mb_y= end_mb_y - FRAME_MBAFF; | |
11170
d092ec99cb59
Merge decode_cabac_mb_dqp() with surronding code.
michael
parents:
11169
diff
changeset
|
2513 h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale); |
d092ec99cb59
Merge decode_cabac_mb_dqp() with surronding code.
michael
parents:
11169
diff
changeset
|
2514 h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale); |
10906 | 2515 } |
2516 | |
11192
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2517 static void predict_field_decoding_flag(H264Context *h){ |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2518 MpegEncContext * const s = &h->s; |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2519 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2520 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2521 ? s->current_picture.mb_type[mb_xy-1] |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2522 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2523 ? s->current_picture.mb_type[mb_xy-s->mb_stride] |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2524 : 0; |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2525 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2526 } |
e1b4f03037d5
Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs
michael
parents:
11191
diff
changeset
|
2527 |
8129
a9734fe0811e
Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents:
8107
diff
changeset
|
2528 static int decode_slice(struct AVCodecContext *avctx, void *arg){ |
a9734fe0811e
Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents:
8107
diff
changeset
|
2529 H264Context *h = *(void**)arg; |
1168 | 2530 MpegEncContext * const s = &h->s; |
2531 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
2532 | |
2533 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
|
2534 |
8353
add1a0d65370
Do not recalculate constant part of is_complex for every MB.
michael
parents:
8352
diff
changeset
|
2535 h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 || |
8742 | 2536 (CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY)); |
8353
add1a0d65370
Do not recalculate constant part of is_complex for every MB.
michael
parents:
8352
diff
changeset
|
2537 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2538 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
|
2539 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2540 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
|
2541 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2542 /* 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
|
2543 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
|
2544 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
|
2545 s->gb.buffer + get_bits_count(&s->gb)/8, |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
10528
diff
changeset
|
2546 (get_bits_left(&s->gb) + 7)/8); |
10869 | 2547 |
2548 ff_h264_init_cabac_states(h); | |
1168 | 2549 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2550 for(;;){ |
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4007
diff
changeset
|
2551 //START_TIMER |
10869 | 2552 int ret = ff_h264_decode_mb_cabac(h); |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2553 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
|
2554 //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
|
2555 |
10852 | 2556 if(ret>=0) ff_h264_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
|
2557 |
3316 | 2558 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
|
2559 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
|
2560 |
10869 | 2561 ret = ff_h264_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
|
2562 |
10852 | 2563 if(ret>=0) ff_h264_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
|
2564 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
|
2565 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2566 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
|
2567 |
11125
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2568 if((s->workaround_bugs & FF_BUG_TRUNCATED) && h->cabac.bytestream > h->cabac.bytestream_end + 2){ |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2569 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); |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2570 return 0; |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2571 } |
3948
3edbf131ee44
refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents:
3947
diff
changeset
|
2572 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) { |
5153 | 2573 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
|
2574 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
|
2575 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
|
2576 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2577 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2578 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
|
2579 s->mb_x = 0; |
10906 | 2580 loop_filter(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
|
2581 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2392 | 2582 ++s->mb_y; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
2583 if(FIELD_OR_MBAFF_PICTURE) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2584 ++s->mb_y; |
11191
5e583a785508
Move check for and call of predict_field_decoding_flag() from the mb code to
michael
parents:
11170
diff
changeset
|
2585 if(FRAME_MBAFF && s->mb_y < s->mb_height) |
5e583a785508
Move check for and call of predict_field_decoding_flag() from the mb code to
michael
parents:
11170
diff
changeset
|
2586 predict_field_decoding_flag(h); |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2587 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2588 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2589 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2590 if( eos || s->mb_y >= s->mb_height ) { |
4600 | 2591 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
|
2592 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
|
2593 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
|
2594 } |
1168 | 2595 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2596 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2597 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2598 for(;;){ |
10866 | 2599 int ret = ff_h264_decode_mb_cavlc(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
|
2600 |
10852 | 2601 if(ret>=0) ff_h264_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
|
2602 |
3316 | 2603 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
|
2604 s->mb_y++; |
10866 | 2605 ret = ff_h264_decode_mb_cavlc(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
|
2606 |
10852 | 2607 if(ret>=0) ff_h264_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
|
2608 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
|
2609 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2610 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2611 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
|
2612 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
|
2613 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
|
2614 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2615 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
|
2616 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2617 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2618 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
|
2619 s->mb_x=0; |
10906 | 2620 loop_filter(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
|
2621 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
|
2622 ++s->mb_y; |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5780
diff
changeset
|
2623 if(FIELD_OR_MBAFF_PICTURE) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2624 ++s->mb_y; |
11191
5e583a785508
Move check for and call of predict_field_decoding_flag() from the mb code to
michael
parents:
11170
diff
changeset
|
2625 if(FRAME_MBAFF && s->mb_y < s->mb_height) |
5e583a785508
Move check for and call of predict_field_decoding_flag() from the mb code to
michael
parents:
11170
diff
changeset
|
2626 predict_field_decoding_flag(h); |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2627 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2628 if(s->mb_y >= s->mb_height){ |
4600 | 2629 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
|
2630 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2631 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
|
2632 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
|
2633 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2634 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
|
2635 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2636 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
|
2637 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2638 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
|
2639 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2640 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2641 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2642 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2643 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
4600 | 2644 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
|
2645 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 2646 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); |
2647 | |
2648 return 0; | |
2649 }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
|
2650 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 | 2651 |
2652 return -1; | |
2653 } | |
2654 } | |
2655 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2656 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2657 |
1168 | 2658 #if 0 |
2659 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
2660 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
2661 int ret= decode_mb(h); | |
2967 | 2662 |
10852 | 2663 ff_h264_hl_decode_mb(h); |
1168 | 2664 |
2665 if(ret<0){ | |
3177 | 2666 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
1168 | 2667 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); |
2668 | |
2669 return -1; | |
2670 } | |
2967 | 2671 |
1168 | 2672 if(++s->mb_x >= s->mb_width){ |
2673 s->mb_x=0; | |
2674 if(++s->mb_y >= s->mb_height){ | |
2675 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
2676 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); | |
2677 | |
2678 return 0; | |
2679 }else{ | |
2680 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); | |
2681 | |
2682 return -1; | |
2683 } | |
2684 } | |
2685 } | |
2967 | 2686 |
1168 | 2687 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ |
2688 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
2689 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); | |
2690 | |
2691 return 0; | |
2692 }else{ | |
2693 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); | |
2694 | |
2695 return -1; | |
2696 } | |
2697 } | |
2698 } | |
2699 s->mb_x=0; | |
2700 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
2701 } | |
2702 #endif | |
2703 return -1; //not reached | |
2704 } | |
2705 | |
5642 | 2706 /** |
2707 * Call decode_slice() for each context. | |
2708 * | |
2709 * @param h h264 master context | |
2710 * @param context_count number of contexts to execute | |
2711 */ | |
2712 static void execute_decode_slices(H264Context *h, int context_count){ | |
2713 MpegEncContext * const s = &h->s; | |
2714 AVCodecContext * const avctx= s->avctx; | |
2715 H264Context *hx; | |
2716 int i; | |
2717 | |
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
9004
diff
changeset
|
2718 if (s->avctx->hwaccel) |
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
9004
diff
changeset
|
2719 return; |
8610 | 2720 if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
2721 return; |
5642 | 2722 if(context_count == 1) { |
8140 | 2723 decode_slice(avctx, &h); |
5642 | 2724 } else { |
2725 for(i = 1; i < context_count; i++) { | |
2726 hx = h->thread_context[i]; | |
7831 | 2727 hx->s.error_recognition = avctx->error_recognition; |
5642 | 2728 hx->s.error_count = 0; |
2729 } | |
2730 | |
2731 avctx->execute(avctx, (void *)decode_slice, | |
10368
59ec306245a4
Remove casts that are useless since the argument is void *.
reimar
parents:
10235
diff
changeset
|
2732 h->thread_context, NULL, context_count, sizeof(void*)); |
5642 | 2733 |
2734 /* pull back stuff from slices to master context */ | |
2735 hx = h->thread_context[context_count - 1]; | |
2736 s->mb_x = hx->s.mb_x; | |
2737 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
|
2738 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
|
2739 s->picture_structure = hx->s.picture_structure; |
5642 | 2740 for(i = 1; i < context_count; i++) |
2741 h->s.error_count += h->thread_context[i]->s.error_count; | |
2742 } | |
2743 } | |
2744 | |
2745 | |
6216 | 2746 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ |
1168 | 2747 MpegEncContext * const s = &h->s; |
2748 AVCodecContext * const avctx= s->avctx; | |
2749 int buf_index=0; | |
5642 | 2750 H264Context *hx; ///< thread context |
2751 int context_count = 0; | |
9449 | 2752 int next_avc= h->is_avc ? 0 : buf_size; |
5642 | 2753 |
2754 h->max_contexts = avctx->thread_count; | |
1322 | 2755 #if 0 |
1168 | 2756 int i; |
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
2757 for(i=0; i<50; i++){ |
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
2758 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]); |
1168 | 2759 } |
2760 #endif | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
2761 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){ |
5642 | 2762 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
|
2763 if (!s->first_field) |
5803 | 2764 s->current_picture_ptr= NULL; |
10858 | 2765 ff_h264_reset_sei(h); |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
2766 } |
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
2767 |
1168 | 2768 for(;;){ |
2769 int consumed; | |
2770 int dst_length; | |
2771 int bit_length; | |
6216 | 2772 const uint8_t *ptr; |
2227 | 2773 int i, nalsize = 0; |
5642 | 2774 int err; |
2967 | 2775 |
9449 | 2776 if(buf_index >= next_avc) { |
5170 | 2777 if(buf_index >= buf_size) break; |
2778 nalsize = 0; | |
2779 for(i = 0; i < h->nal_length_size; i++) | |
2780 nalsize = (nalsize << 8) | buf[buf_index++]; | |
9898
003d7f830e2a
Fix nalsize check to avoid an integer overflow that made the check
reimar
parents:
9885
diff
changeset
|
2781 if(nalsize <= 1 || nalsize > buf_size - buf_index){ |
5170 | 2782 if(nalsize == 1){ |
2783 buf_index++; | |
2784 continue; | |
2785 }else{ | |
2786 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); | |
2787 break; | |
2788 } | |
2789 } | |
9449 | 2790 next_avc= buf_index + nalsize; |
5170 | 2791 } else { |
2792 // start code prefix search | |
10663
dc61c373810e
End startcode prefix search at the end of a AVC unit.
michael
parents:
10656
diff
changeset
|
2793 for(; buf_index + 3 < next_avc; buf_index++){ |
5170 | 2794 // This should always succeed in the first iteration. |
2795 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
2796 break; | |
2797 } | |
2798 | |
2799 if(buf_index+3 >= buf_size) break; | |
2800 | |
2801 buf_index+=3; | |
10663
dc61c373810e
End startcode prefix search at the end of a AVC unit.
michael
parents:
10656
diff
changeset
|
2802 if(buf_index >= next_avc) continue; |
5170 | 2803 } |
2967 | 2804 |
5642 | 2805 hx = h->thread_context[context_count]; |
2806 | |
9449 | 2807 ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); |
4828
58f1856608f6
scenario: A properly coded frame is followed by an end of sequence NAL unit,
diego
parents:
4795
diff
changeset
|
2808 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
|
2809 return -1; |
0271b214458b
harden h264 decoding to prevent some crashes when input data is corrupted.
gpoirier
parents:
4354
diff
changeset
|
2810 } |
11125
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2811 i= buf_index + consumed; |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2812 if((s->workaround_bugs & FF_BUG_AUTODETECT) && i+3<next_avc && |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2813 buf[i]==0x00 && buf[i+1]==0x00 && buf[i+2]==0x01 && buf[i+3]==0xE0) |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2814 s->workaround_bugs |= FF_BUG_TRUNCATED; |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2815 |
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2816 if(!(s->workaround_bugs & FF_BUG_TRUNCATED)){ |
4829
e3161603a048
Remove a NAL unit's trailing zero bytes even when dst_length is 1.
diego
parents:
4828
diff
changeset
|
2817 while(ptr[dst_length - 1] == 0 && dst_length > 0) |
3341 | 2818 dst_length--; |
11125
1f13ac0e696b
Try to support truncated h264 frames mixed with mpeg pes headers in mkv.
michael
parents:
11097
diff
changeset
|
2819 } |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
2820 bit_length= !dst_length ? 0 : (8*dst_length - ff_h264_decode_rbsp_trailing(h, ptr + dst_length - 1)); |
1168 | 2821 |
2822 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
5642 | 2823 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 | 2824 } |
2967 | 2825 |
9449 | 2826 if (h->is_avc && (nalsize != consumed) && nalsize){ |
10656
34911596ffed
Reduce warnings about too few consumed bytes to debug level.
michael
parents:
10565
diff
changeset
|
2827 av_log(h->s.avctx, AV_LOG_DEBUG, "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
|
2828 } |
2227 | 2829 |
1168 | 2830 buf_index += consumed; |
2831 | |
5127 | 2832 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME do not discard SEI id |
2792 | 2833 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
1168 | 2834 continue; |
2967 | 2835 |
5642 | 2836 again: |
2837 err = 0; | |
2838 switch(hx->nal_unit_type){ | |
1168 | 2839 case NAL_IDR_SLICE: |
5642 | 2840 if (h->nal_unit_type != NAL_IDR_SLICE) { |
2841 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices"); | |
2842 return -1; | |
2843 } | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2844 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
1168 | 2845 case NAL_SLICE: |
5642 | 2846 init_get_bits(&hx->s.gb, ptr, bit_length); |
2847 hx->intra_gb_ptr= | |
2848 hx->inter_gb_ptr= &hx->s.gb; | |
2849 hx->s.data_partitioning = 0; | |
2850 | |
2851 if((err = decode_slice_header(hx, h))) | |
2852 break; | |
2853 | |
11555
e603f624b03f
Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
cehoyos
parents:
11533
diff
changeset
|
2854 if (h->current_slice == 1) { |
e603f624b03f
Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
cehoyos
parents:
11533
diff
changeset
|
2855 if (s->avctx->hwaccel && s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0) |
9066 | 2856 return -1; |
11555
e603f624b03f
Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
cehoyos
parents:
11533
diff
changeset
|
2857 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
e603f624b03f
Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
cehoyos
parents:
11533
diff
changeset
|
2858 ff_vdpau_h264_picture_start(s); |
9066 | 2859 } |
2860 | |
8783
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
2861 s->current_picture_ptr->key_frame |= |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
2862 (hx->nal_unit_type == NAL_IDR_SLICE) || |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
2863 (h->sei_recovery_frame_cnt >= 0); |
5642 | 2864 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5 |
2865 && (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
|
2866 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) |
7340 | 2867 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
2868 && avctx->skip_frame < AVDISCARD_ALL){ |
9045
5fb849bddf4a
Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents:
9035
diff
changeset
|
2869 if(avctx->hwaccel) { |
5fb849bddf4a
Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents:
9035
diff
changeset
|
2870 if (avctx->hwaccel->decode_slice(avctx, &buf[buf_index - consumed], consumed) < 0) |
5fb849bddf4a
Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents:
9035
diff
changeset
|
2871 return -1; |
5fb849bddf4a
Add hwaccel->decode_slice() call for avhwaccel by Gwenole Beauchesne.
michael
parents:
9035
diff
changeset
|
2872 }else |
8610 | 2873 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){ |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
2874 static const uint8_t start_code[] = {0x00, 0x00, 0x01}; |
8563
b59279494d84
Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents:
8562
diff
changeset
|
2875 ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code)); |
b59279494d84
Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
cehoyos
parents:
8562
diff
changeset
|
2876 ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed ); |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
2877 }else |
8524 | 2878 context_count++; |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
2879 } |
1168 | 2880 break; |
2881 case NAL_DPA: | |
5642 | 2882 init_get_bits(&hx->s.gb, ptr, bit_length); |
2883 hx->intra_gb_ptr= | |
2884 hx->inter_gb_ptr= NULL; | |
9910
d07aee233d03
H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents:
9898
diff
changeset
|
2885 |
d07aee233d03
H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents:
9898
diff
changeset
|
2886 if ((err = decode_slice_header(hx, h)) < 0) |
d07aee233d03
H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents:
9898
diff
changeset
|
2887 break; |
d07aee233d03
H.264: Don't set data_partitioning for invalid NAL_DPA.
astrange
parents:
9898
diff
changeset
|
2888 |
5642 | 2889 hx->s.data_partitioning = 1; |
2890 | |
1168 | 2891 break; |
2892 case NAL_DPB: | |
5642 | 2893 init_get_bits(&hx->intra_gb, ptr, bit_length); |
2894 hx->intra_gb_ptr= &hx->intra_gb; | |
1168 | 2895 break; |
2896 case NAL_DPC: | |
5642 | 2897 init_get_bits(&hx->inter_gb, ptr, bit_length); |
2898 hx->inter_gb_ptr= &hx->inter_gb; | |
2899 | |
2900 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
|
2901 && s->context_initialized |
2793 | 2902 && s->hurry_up < 5 |
5642 | 2903 && (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
|
2904 && (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE) |
7340 | 2905 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE) |
2793 | 2906 && avctx->skip_frame < AVDISCARD_ALL) |
5642 | 2907 context_count++; |
1168 | 2908 break; |
2909 case NAL_SEI: | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
2910 init_get_bits(&s->gb, ptr, bit_length); |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
2911 ff_h264_decode_sei(h); |
1168 | 2912 break; |
2913 case NAL_SPS: | |
2914 init_get_bits(&s->gb, ptr, bit_length); | |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
2915 ff_h264_decode_seq_parameter_set(h); |
2967 | 2916 |
1168 | 2917 if(s->flags& CODEC_FLAG_LOW_DELAY) |
2918 s->low_delay=1; | |
2967 | 2919 |
2538 | 2920 if(avctx->has_b_frames < 2) |
2921 avctx->has_b_frames= !s->low_delay; | |
1168 | 2922 break; |
2923 case NAL_PPS: | |
2924 init_get_bits(&s->gb, ptr, bit_length); | |
2967 | 2925 |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
2926 ff_h264_decode_picture_parameter_set(h, bit_length); |
1168 | 2927 |
2928 break; | |
2960 | 2929 case NAL_AUD: |
2930 case NAL_END_SEQUENCE: | |
2931 case NAL_END_STREAM: | |
2932 case NAL_FILLER_DATA: | |
2933 case NAL_SPS_EXT: | |
2934 case NAL_AUXILIARY_SLICE: | |
1168 | 2935 break; |
2979 | 2936 default: |
10811 | 2937 av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", hx->nal_unit_type, bit_length); |
2967 | 2938 } |
5642 | 2939 |
2940 if(context_count == h->max_contexts) { | |
2941 execute_decode_slices(h, context_count); | |
2942 context_count = 0; | |
2943 } | |
2944 | |
2945 if (err < 0) | |
2946 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
2947 else if(err == 1) { | |
2948 /* Slice could not be decoded in parallel mode, copy down | |
2949 * NAL unit stuff to context 0 and restart. Note that | |
7374 | 2950 * rbsp_buffer is not transferred, but since we no longer |
5642 | 2951 * run in parallel mode this should not be an issue. */ |
2952 h->nal_unit_type = hx->nal_unit_type; | |
2953 h->nal_ref_idc = hx->nal_ref_idc; | |
2954 hx = h; | |
2955 goto again; | |
2956 } | |
2957 } | |
2958 if(context_count) | |
2959 execute_decode_slices(h, context_count); | |
1168 | 2960 return buf_index; |
2961 } | |
2962 | |
2963 /** | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2964 * returns the number of bytes consumed for building the current frame |
1168 | 2965 */ |
2966 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
5127 | 2967 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
1168 | 2968 if(pos+10>buf_size) pos=buf_size; // oops ;) |
2969 | |
2970 return pos; | |
2971 } | |
2972 | |
2967 | 2973 static int decode_frame(AVCodecContext *avctx, |
1168 | 2974 void *data, int *data_size, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9163
diff
changeset
|
2975 AVPacket *avpkt) |
1168 | 2976 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9163
diff
changeset
|
2977 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9163
diff
changeset
|
2978 int buf_size = avpkt->size; |
1168 | 2979 H264Context *h = avctx->priv_data; |
2980 MpegEncContext *s = &h->s; | |
2967 | 2981 AVFrame *pict = data; |
1168 | 2982 int buf_index; |
2967 | 2983 |
1168 | 2984 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
2985 s->flags2= avctx->flags2; |
1168 | 2986 |
7374 | 2987 /* end of stream, output what is still in the buffers */ |
1168 | 2988 if (buf_size == 0) { |
4556 | 2989 Picture *out; |
2990 int i, out_idx; | |
2991 | |
2992 //FIXME factorize this with the output code below | |
2993 out = h->delayed_pic[0]; | |
2994 out_idx = 0; | |
9885 | 2995 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++) |
4556 | 2996 if(h->delayed_pic[i]->poc < out->poc){ |
2997 out = h->delayed_pic[i]; | |
2998 out_idx = i; | |
2999 } | |
3000 | |
3001 for(i=out_idx; h->delayed_pic[i]; i++) | |
3002 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
3003 | |
3004 if(out){ | |
3005 *data_size = sizeof(AVFrame); | |
3006 *pict= *(AVFrame*)out; | |
3007 } | |
3008 | |
1168 | 3009 return 0; |
3010 } | |
2967 | 3011 |
1168 | 3012 buf_index=decode_nal_units(h, buf, buf_size); |
2967 | 3013 if(buf_index < 0) |
1168 | 3014 return -1; |
3015 | |
4620 | 3016 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ |
5629
7e5ebda833e9
Remove error raising when explicitely skipping frame
benoit
parents:
5547
diff
changeset
|
3017 if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; |
4620 | 3018 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); |
3019 return -1; | |
3020 } | |
3021 | |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3022 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
|
3023 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
|
3024 Picture *cur = s->current_picture_ptr; |
10511
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3025 int i, pics, out_of_order, out_idx; |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3026 |
9417 | 3027 field_end(h); |
4616
8036b117ae26
support feeding individual NAL units to the decoder instead of just complete frames
michael
parents:
4600
diff
changeset
|
3028 |
7382
f9e70983fc35
Set field_poc (it was half uninitialized before) and use it
michael
parents:
7381
diff
changeset
|
3029 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
|
3030 /* 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
|
3031 *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
|
3032 |
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3033 } else { |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3034 cur->interlaced_frame = 0; |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3035 cur->repeat_pict = 0; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3036 |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3037 /* Signal interlacing information externally. */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3038 /* Prioritize picture timing SEI information over used decoding process if it exists. */ |
9128
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9125
diff
changeset
|
3039 |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3040 if(h->sps.pic_struct_present_flag){ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3041 switch (h->sei_pic_struct) |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3042 { |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3043 case SEI_PIC_STRUCT_FRAME: |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3044 break; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3045 case SEI_PIC_STRUCT_TOP_FIELD: |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3046 case SEI_PIC_STRUCT_BOTTOM_FIELD: |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3047 cur->interlaced_frame = 1; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3048 break; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3049 case SEI_PIC_STRUCT_TOP_BOTTOM: |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3050 case SEI_PIC_STRUCT_BOTTOM_TOP: |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3051 if (FIELD_OR_MBAFF_PICTURE) |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3052 cur->interlaced_frame = 1; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3053 else |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3054 // try to flag soft telecine progressive |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3055 cur->interlaced_frame = h->prev_interlaced_frame; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3056 break; |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3057 case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3058 case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3059 // Signal the possibility of telecined film externally (pic_struct 5,6) |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3060 // From these hints, let the applications decide if they apply deinterlacing. |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3061 cur->repeat_pict = 1; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3062 break; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3063 case SEI_PIC_STRUCT_FRAME_DOUBLING: |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3064 // Force progressive here, as doubling interlaced frame is a bad idea. |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3065 cur->repeat_pict = 2; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3066 break; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3067 case SEI_PIC_STRUCT_FRAME_TRIPLING: |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3068 cur->repeat_pict = 4; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3069 break; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3070 } |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3071 |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3072 if ((h->sei_ct_type & 3) && h->sei_pic_struct <= SEI_PIC_STRUCT_BOTTOM_TOP) |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3073 cur->interlaced_frame = (h->sei_ct_type & (1<<1)) != 0; |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3074 }else{ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3075 /* Derive interlacing flag from used decoding process. */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3076 cur->interlaced_frame = FIELD_OR_MBAFF_PICTURE; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3077 } |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9790
diff
changeset
|
3078 h->prev_interlaced_frame = cur->interlaced_frame; |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3079 |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3080 if (cur->field_poc[0] != cur->field_poc[1]){ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3081 /* Derive top_field_first from field pocs. */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3082 cur->top_field_first = cur->field_poc[0] < cur->field_poc[1]; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3083 }else{ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3084 if(cur->interlaced_frame || h->sps.pic_struct_present_flag){ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3085 /* Use picture timing SEI information. Even if it is a information of a past frame, better than nothing. */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3086 if(h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3087 || h->sei_pic_struct == SEI_PIC_STRUCT_TOP_BOTTOM_TOP) |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3088 cur->top_field_first = 1; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3089 else |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3090 cur->top_field_first = 0; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3091 }else{ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3092 /* Most likely progressive */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3093 cur->top_field_first = 0; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3094 } |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
3095 } |
5876
731ee5ad6bde
Correct assignment of interlaced_frame; was being set on output frames,
heydowns
parents:
5825
diff
changeset
|
3096 |
5803 | 3097 //FIXME do something with unavailable reference frames |
2967 | 3098 |
5803 | 3099 /* Sort B-frames into display order */ |
3100 | |
3101 if(h->sps.bitstream_restriction_flag | |
3102 && s->avctx->has_b_frames < h->sps.num_reorder_frames){ | |
3103 s->avctx->has_b_frames = h->sps.num_reorder_frames; | |
3104 s->low_delay = 0; | |
3105 } | |
3106 | |
7325
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
3107 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
|
3108 && !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
|
3109 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
|
3110 s->low_delay= 0; |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
3111 } |
af725308adf4
Take the brain amputated spec literally if the user asks for it (-strict 1).
michael
parents:
7320
diff
changeset
|
3112 |
5803 | 3113 pics = 0; |
3114 while(h->delayed_pic[pics]) pics++; | |
3115 | |
7283
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7277
diff
changeset
|
3116 assert(pics <= MAX_DELAYED_PIC_COUNT); |
5803 | 3117 |
3118 h->delayed_pic[pics++] = cur; | |
3119 if(cur->reference == 0) | |
3120 cur->reference = DELAYED_PIC_REF; | |
3121 | |
3122 out = h->delayed_pic[0]; | |
3123 out_idx = 0; | |
9885 | 3124 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++) |
5803 | 3125 if(h->delayed_pic[i]->poc < out->poc){ |
3126 out = h->delayed_pic[i]; | |
3127 out_idx = i; | |
3128 } | |
10511
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3129 if(s->avctx->has_b_frames == 0 && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset)) |
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3130 h->outputed_poc= INT_MIN; |
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3131 out_of_order = out->poc < h->outputed_poc; |
7310
033d10927d45
Remove delayed_output_pic, I do not understand what this variable was good for.
michael
parents:
7309
diff
changeset
|
3132 |
5803 | 3133 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
3134 { } | |
7320
927ac918cddb
Make the automatic has_b_frames increasing code increase it up to the
michael
parents:
7318
diff
changeset
|
3135 else if((out_of_order && pics-1 == s->avctx->has_b_frames && s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) |
5803 | 3136 || (s->low_delay && |
10511
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3137 ((h->outputed_poc != INT_MIN && out->poc > h->outputed_poc + 2) |
6481 | 3138 || cur->pict_type == FF_B_TYPE))) |
5803 | 3139 { |
3140 s->low_delay = 0; | |
3141 s->avctx->has_b_frames++; | |
7312 | 3142 } |
3143 | |
7316 | 3144 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
|
3145 out->reference &= ~DELAYED_PIC_REF; |
5803 | 3146 for(i=out_idx; h->delayed_pic[i]; i++) |
3147 h->delayed_pic[i] = h->delayed_pic[i+1]; | |
3148 } | |
7316 | 3149 if(!out_of_order && pics > s->avctx->has_b_frames){ |
5803 | 3150 *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
|
3151 |
10511
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3152 if(out_idx==0 && h->delayed_pic[0] && (h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset)) { |
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3153 h->outputed_poc = INT_MIN; |
bfea93e47391
Try to fix has_b_frame calculation for open gop files.
michael
parents:
10368
diff
changeset
|
3154 } else |
10514 | 3155 h->outputed_poc = out->poc; |
5803 | 3156 *pict= *(AVFrame*)out; |
7316 | 3157 }else{ |
5803 | 3158 av_log(avctx, AV_LOG_DEBUG, "no picture\n"); |
7316 | 3159 } |
5798
7b058e5183ab
Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents:
5797
diff
changeset
|
3160 } |
2937 | 3161 } |
3162 | |
3163 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
|
3164 ff_print_debug_info(s, pict); |
1168 | 3165 //printf("out %d\n", (int)pict->data[0]); |
9733
67f917b48068
remove unused hack which set AVCodecContext frame_number to pic timestamp
bcoudurier
parents:
9698
diff
changeset
|
3166 |
1168 | 3167 return get_consumed_bytes(s, buf_index, buf_size); |
3168 } | |
3169 #if 0 | |
3170 static inline void fill_mb_avail(H264Context *h){ | |
3171 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
|
3172 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 3173 |
3174 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
|
3175 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
|
3176 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
|
3177 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 3178 }else{ |
3179 h->mb_avail[0]= | |
3180 h->mb_avail[1]= | |
3181 h->mb_avail[2]= 0; | |
3182 } | |
3183 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
3184 h->mb_avail[4]= 1; //FIXME move out | |
3185 h->mb_avail[5]= 0; //FIXME move out | |
3186 } | |
3187 #endif | |
3188 | |
6164
ecaf5226e9b0
Consistently use TEST as the preprocessor condition to enable test code.
diego
parents:
6046
diff
changeset
|
3189 #ifdef TEST |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
3190 #undef printf |
5380
389366aa3458
Fix the self tests which are contained in some codecs and are using random().
takis
parents:
5338
diff
changeset
|
3191 #undef random |
1168 | 3192 #define COUNT 8000 |
3193 #define SIZE (COUNT*40) | |
5934 | 3194 int main(void){ |
1168 | 3195 int i; |
3196 uint8_t temp[SIZE]; | |
3197 PutBitContext pb; | |
3198 GetBitContext gb; | |
3199 // int int_temp[10000]; | |
3200 DSPContext dsp; | |
3201 AVCodecContext avctx; | |
2967 | 3202 |
1168 | 3203 dsputil_init(&dsp, &avctx); |
3204 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
3205 init_put_bits(&pb, temp, SIZE); |
1168 | 3206 printf("testing unsigned exp golomb\n"); |
3207 for(i=0; i<COUNT; i++){ | |
3208 START_TIMER | |
3209 set_ue_golomb(&pb, i); | |
3210 STOP_TIMER("set_ue_golomb"); | |
3211 } | |
3212 flush_put_bits(&pb); | |
2967 | 3213 |
1168 | 3214 init_get_bits(&gb, temp, 8*SIZE); |
3215 for(i=0; i<COUNT; i++){ | |
3216 int j, s; | |
2967 | 3217 |
1168 | 3218 s= show_bits(&gb, 24); |
2967 | 3219 |
1168 | 3220 START_TIMER |
3221 j= get_ue_golomb(&gb); | |
3222 if(j != i){ | |
5127 | 3223 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
1168 | 3224 // return -1; |
3225 } | |
3226 STOP_TIMER("get_ue_golomb"); | |
3227 } | |
2967 | 3228 |
3229 | |
1524 | 3230 init_put_bits(&pb, temp, SIZE); |
1168 | 3231 printf("testing signed exp golomb\n"); |
3232 for(i=0; i<COUNT; i++){ | |
3233 START_TIMER | |
3234 set_se_golomb(&pb, i - COUNT/2); | |
3235 STOP_TIMER("set_se_golomb"); | |
3236 } | |
3237 flush_put_bits(&pb); | |
2967 | 3238 |
1168 | 3239 init_get_bits(&gb, temp, 8*SIZE); |
3240 for(i=0; i<COUNT; i++){ | |
3241 int j, s; | |
2967 | 3242 |
1168 | 3243 s= show_bits(&gb, 24); |
2967 | 3244 |
1168 | 3245 START_TIMER |
3246 j= get_se_golomb(&gb); | |
3247 if(j != i - COUNT/2){ | |
5127 | 3248 printf("mismatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); |
1168 | 3249 // return -1; |
3250 } | |
3251 STOP_TIMER("get_se_golomb"); | |
3252 } | |
3253 | |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
3254 #if 0 |
1168 | 3255 printf("testing 4x4 (I)DCT\n"); |
2967 | 3256 |
1168 | 3257 DCTELEM block[16]; |
3258 uint8_t src[16], ref[16]; | |
3259 uint64_t error= 0, max_error=0; | |
3260 | |
3261 for(i=0; i<COUNT; i++){ | |
3262 int j; | |
3263 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
3264 for(j=0; j<16; j++){ | |
3265 ref[j]= random()%255; | |
3266 src[j]= random()%255; | |
3267 } | |
3268 | |
3269 h264_diff_dct_c(block, src, ref, 4); | |
2967 | 3270 |
1168 | 3271 //normalize |
3272 for(j=0; j<16; j++){ | |
3273 // printf("%d ", block[j]); | |
3274 block[j]= block[j]*4; | |
3275 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
3276 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
3277 } | |
3278 // printf("\n"); | |
2967 | 3279 |
11499 | 3280 h->h264dsp.h264_idct_add(ref, block, 4); |
1168 | 3281 /* for(j=0; j<16; j++){ |
3282 printf("%d ", ref[j]); | |
3283 } | |
3284 printf("\n");*/ | |
2967 | 3285 |
1168 | 3286 for(j=0; j<16; j++){ |
4001 | 3287 int diff= FFABS(src[j] - ref[j]); |
2967 | 3288 |
1168 | 3289 error+= diff*diff; |
3290 max_error= FFMAX(max_error, diff); | |
3291 } | |
3292 } | |
3293 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
3294 printf("testing quantizer\n"); | |
3295 for(qp=0; qp<52; qp++){ | |
3296 for(i=0; i<16; i++) | |
3297 src1_block[i]= src2_block[i]= random()%255; | |
2967 | 3298 |
1168 | 3299 } |
3300 printf("Testing NAL layer\n"); | |
2967 | 3301 |
1168 | 3302 uint8_t bitstream[COUNT]; |
3303 uint8_t nal[COUNT*2]; | |
3304 H264Context h; | |
3305 memset(&h, 0, sizeof(H264Context)); | |
2967 | 3306 |
1168 | 3307 for(i=0; i<COUNT; i++){ |
3308 int zeros= i; | |
3309 int nal_length; | |
3310 int consumed; | |
3311 int out_length; | |
3312 uint8_t *out; | |
3313 int j; | |
2967 | 3314 |
1168 | 3315 for(j=0; j<COUNT; j++){ |
3316 bitstream[j]= (random() % 255) + 1; | |
3317 } | |
2967 | 3318 |
1168 | 3319 for(j=0; j<zeros; j++){ |
3320 int pos= random() % COUNT; | |
3321 while(bitstream[pos] == 0){ | |
3322 pos++; | |
3323 pos %= COUNT; | |
3324 } | |
3325 bitstream[pos]=0; | |
3326 } | |
2967 | 3327 |
1168 | 3328 START_TIMER |
2967 | 3329 |
1168 | 3330 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); |
3331 if(nal_length<0){ | |
3332 printf("encoding failed\n"); | |
3333 return -1; | |
3334 } | |
2967 | 3335 |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8991
diff
changeset
|
3336 out= ff_h264_decode_nal(&h, nal, &out_length, &consumed, nal_length); |
1168 | 3337 |
3338 STOP_TIMER("NAL") | |
2967 | 3339 |
1168 | 3340 if(out_length != COUNT){ |
3341 printf("incorrect length %d %d\n", out_length, COUNT); | |
3342 return -1; | |
3343 } | |
2967 | 3344 |
1168 | 3345 if(consumed != nal_length){ |
3346 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
3347 return -1; | |
3348 } | |
2967 | 3349 |
1168 | 3350 if(memcmp(bitstream, out, COUNT)){ |
5127 | 3351 printf("mismatch\n"); |
1168 | 3352 return -1; |
3353 } | |
3354 } | |
6172
13aa4cac4dde
Add #undef printf and disable non-functional code to make test program compile.
diego
parents:
6164
diff
changeset
|
3355 #endif |
2967 | 3356 |
1168 | 3357 printf("Testing RBSP\n"); |
2967 | 3358 |
3359 | |
1168 | 3360 return 0; |
3361 } | |
6164
ecaf5226e9b0
Consistently use TEST as the preprocessor condition to enable test code.
diego
parents:
6046
diff
changeset
|
3362 #endif /* TEST */ |
1168 | 3363 |
3364 | |
9384
828d15d322ed
Add forgotten void return type to ff_h264_free_context
reimar
parents:
9380
diff
changeset
|
3365 av_cold void ff_h264_free_context(H264Context *h) |
1168 | 3366 { |
7923 | 3367 int i; |
2967 | 3368 |
1168 | 3369 free_tables(h); //FIXME cleanup init stuff perhaps |
7923 | 3370 |
3371 for(i = 0; i < MAX_SPS_COUNT; i++) | |
3372 av_freep(h->sps_buffers + i); | |
3373 | |
3374 for(i = 0; i < MAX_PPS_COUNT; i++) | |
3375 av_freep(h->pps_buffers + i); | |
9380
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3376 } |
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3377 |
10852 | 3378 av_cold int ff_h264_decode_end(AVCodecContext *avctx) |
9380
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3379 { |
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3380 H264Context *h = avctx->priv_data; |
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3381 MpegEncContext *s = &h->s; |
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3382 |
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9355
diff
changeset
|
3383 ff_h264_free_context(h); |
7923 | 3384 |
1168 | 3385 MPV_common_end(s); |
3386 | |
3387 // memset(h, 0, sizeof(H264Context)); | |
2967 | 3388 |
1168 | 3389 return 0; |
3390 } | |
3391 | |
3392 | |
3393 AVCodec h264_decoder = { | |
3394 "h264", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11558
diff
changeset
|
3395 AVMEDIA_TYPE_VIDEO, |
1168 | 3396 CODEC_ID_H264, |
3397 sizeof(H264Context), | |
10852 | 3398 ff_h264_decode_init, |
1168 | 3399 NULL, |
10852 | 3400 ff_h264_decode_end, |
1168 | 3401 decode_frame, |
7359
1980cae356ad
Remove truncated support, use an AVParser if you used that, it is the same.
michael
parents:
7358
diff
changeset
|
3402 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY, |
2640 | 3403 .flush= flush_dpb, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6933
diff
changeset
|
3404 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), |
1168 | 3405 }; |
3406 | |
8590 | 3407 #if CONFIG_H264_VDPAU_DECODER |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3408 AVCodec h264_vdpau_decoder = { |
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3409 "h264_vdpau", |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11558
diff
changeset
|
3410 AVMEDIA_TYPE_VIDEO, |
8610 | 3411 CODEC_ID_H264, |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3412 sizeof(H264Context), |
10852 | 3413 ff_h264_decode_init, |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3414 NULL, |
10852 | 3415 ff_h264_decode_end, |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3416 decode_frame, |
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3417 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, |
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3418 .flush= flush_dpb, |
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3419 .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), |
10512
6ec7b5450ca7
Add .pix_fmts to H264 VDPAU decoder declaration and remove obsolete test
cehoyos
parents:
10511
diff
changeset
|
3420 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE}, |
8522
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3421 }; |
f8c091bb5779
Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents:
8456
diff
changeset
|
3422 #endif |