Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/videolan/dav1d.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRaphael Zumer <rzumer@tebako.net>2018-09-26 02:15:44 +0300
committerRonald S. Bultje <rsbultje@gmail.com>2018-09-26 02:21:35 +0300
commitcbeac008b7f5fd4970b67af619f73775ec7076a0 (patch)
tree1cba5f811a3aaacd9c776277aa7ccd1e8d6ecf74 /src
parenta0364377f84f9fd325b211203624d35c0cbcc79d (diff)
Fix style issues
Diffstat (limited to 'src')
-rw-r--r--src/recon.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/recon.c b/src/recon.c
index e1e576c..685b9b7 100644
--- a/src/recon.c
+++ b/src/recon.c
@@ -1488,7 +1488,6 @@ void bytefn(filter_sbrow)(Dav1dFrameContext *const f, const int sby) {
void bytefn(backup_ipred_edge)(Dav1dTileContext *const t) {
const Dav1dFrameContext *const f = t->f;
Dav1dTileState *const ts = t->ts;
- const int monochrome = f->cur.p.p.layout == DAV1D_PIXEL_LAYOUT_I400;
const int sby = t->by >> f->sb_shift;
const int sby_off = f->sb128w * 128 * sby;
const int x_off = ts->tiling.col_start;
@@ -1499,12 +1498,12 @@ void bytefn(backup_ipred_edge)(Dav1dTileContext *const t) {
pixel_copy(&f->ipred_edge[0][sby_off + x_off * 4], y,
4 * (ts->tiling.col_end - x_off));
- if (!monochrome) {
+ if (f->cur.p.p.layout != DAV1D_PIXEL_LAYOUT_I400) {
const int ss_ver = f->cur.p.p.layout == DAV1D_PIXEL_LAYOUT_I420;
const int ss_hor = f->cur.p.p.layout != DAV1D_PIXEL_LAYOUT_I444;
const ptrdiff_t uv_off = (x_off * 4 >> ss_hor) +
- (((t->by + f->sb_step) * 4 >> ss_ver) - 1) * PXSTRIDE(f->cur.p.stride[1]);
+ (((t->by + f->sb_step) * 4 >> ss_ver) - 1) * PXSTRIDE(f->cur.p.stride[1]);
for (int pl = 1; pl <= 2; pl++)
pixel_copy(&f->ipred_edge[pl][sby_off + (x_off * 4 >> ss_hor)],
&((const pixel *) f->cur.p.data[pl])[uv_off],