Mercurial > libavcodec.hg
comparison vaapi_h264.c @ 11359:471c370c6b05 libavcodec
Cope with rev 22183:
Reorder indexes in weight tables.
author | gb |
---|---|
date | Thu, 04 Mar 2010 09:14:19 +0000 |
parents | f5ebc14d90f0 |
children | 8a4984c5cacc |
comparison
equal
deleted
inserted
replaced
11358:a1376a6f9af1 | 11359:471c370c6b05 |
---|---|
196 | 196 |
197 for (i = 0; i < h->ref_count[list]; i++) { | 197 for (i = 0; i < h->ref_count[list]; i++) { |
198 /* VA API also wants the inferred (default) values, not | 198 /* VA API also wants the inferred (default) values, not |
199 only what is available in the bitstream (7.4.3.2). */ | 199 only what is available in the bitstream (7.4.3.2). */ |
200 if (h->luma_weight_flag[list]) { | 200 if (h->luma_weight_flag[list]) { |
201 luma_weight[i] = h->luma_weight[list][i][0]; | 201 luma_weight[i] = h->luma_weight[i][list][0]; |
202 luma_offset[i] = h->luma_weight[list][i][1]; | 202 luma_offset[i] = h->luma_weight[i][list][1]; |
203 } else { | 203 } else { |
204 luma_weight[i] = 1 << h->luma_log2_weight_denom; | 204 luma_weight[i] = 1 << h->luma_log2_weight_denom; |
205 luma_offset[i] = 0; | 205 luma_offset[i] = 0; |
206 } | 206 } |
207 for (j = 0; j < 2; j++) { | 207 for (j = 0; j < 2; j++) { |
208 if (h->chroma_weight_flag[list]) { | 208 if (h->chroma_weight_flag[list]) { |
209 chroma_weight[i][j] = h->chroma_weight[list][i][j][0]; | 209 chroma_weight[i][j] = h->chroma_weight[i][list][j][0]; |
210 chroma_offset[i][j] = h->chroma_weight[list][i][j][1]; | 210 chroma_offset[i][j] = h->chroma_weight[i][list][j][1]; |
211 } else { | 211 } else { |
212 chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom; | 212 chroma_weight[i][j] = 1 << h->chroma_log2_weight_denom; |
213 chroma_offset[i][j] = 0; | 213 chroma_offset[i][j] = 0; |
214 } | 214 } |
215 } | 215 } |