Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
49bcbac0
Commit
49bcbac0
authored
Dec 20, 2017
by
Urvang Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build when HIGHBITDEPTH and TXMG are off.
Change-Id: I9cedde11c45d84a9604a588cef3ad1ce9888499e
parent
da11e697
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
aom_dsp/intrapred.c
aom_dsp/intrapred.c
+3
-1
av1/common/idct.c
av1/common/idct.c
+0
-2
av1/encoder/hybrid_fwd_txfm.c
av1/encoder/hybrid_fwd_txfm.c
+5
-5
No files found.
aom_dsp/intrapred.c
View file @
49bcbac0
...
...
@@ -1038,7 +1038,9 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
intra_pred_sized(type, 4, 16) \
intra_pred_sized(type, 16, 4) \
intra_pred_sized(type, 8, 32) \
intra_pred_sized(type, 32, 8)
intra_pred_sized(type, 32, 8) \
intra_pred_sized(type, 16, 64) \
intra_pred_sized(type, 64, 16)
#define intra_pred_above_4x4(type) \
intra_pred_sized(type, 8, 8) \
intra_pred_sized(type, 16, 16) \
...
...
av1/common/idct.c
View file @
49bcbac0
...
...
@@ -179,7 +179,6 @@ static void maybe_flip_strides(uint8_t **dst, int *dstride, tran_low_t **src,
}
}
#if CONFIG_HIGHBITDEPTH
#if CONFIG_TX64X64
static
void
highbd_inv_idtx_add_c
(
const
tran_low_t
*
input
,
uint8_t
*
dest8
,
int
stride
,
int
bsx
,
int
bsy
,
TX_TYPE
tx_type
,
...
...
@@ -198,7 +197,6 @@ static void highbd_inv_idtx_add_c(const tran_low_t *input, uint8_t *dest8,
}
}
#endif // CONFIG_TX64X64
#endif // CONFIG_HIGHBITDEPTH
void
av1_iht4x4_16_add_c
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
const
TxfmParam
*
txfm_param
)
{
...
...
av1/encoder/hybrid_fwd_txfm.c
View file @
49bcbac0
...
...
@@ -414,7 +414,7 @@ static void highbd_fwd_txfm_32x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_32x64_c
(
src_diff
,
dst_coeff
,
diff_stride
,
DCT_DCT
,
bd
);
break
;
case
IDTX
:
av1_fwd_idtx_c
(
src_diff
,
dst_
coeff
,
diff_stride
,
32
,
64
,
tx_type
);
av1_fwd_idtx_c
(
src_diff
,
coeff
,
diff_stride
,
32
,
64
,
tx_type
);
break
;
default:
assert
(
0
);
break
;
}
...
...
@@ -452,7 +452,7 @@ static void highbd_fwd_txfm_64x32(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x32_c
(
src_diff
,
dst_coeff
,
diff_stride
,
DCT_DCT
,
bd
);
break
;
case
IDTX
:
av1_fwd_idtx_c
(
src_diff
,
dst_
coeff
,
diff_stride
,
64
,
32
,
tx_type
);
av1_fwd_idtx_c
(
src_diff
,
coeff
,
diff_stride
,
64
,
32
,
tx_type
);
break
;
default:
assert
(
0
);
break
;
}
...
...
@@ -490,7 +490,7 @@ static void highbd_fwd_txfm_16x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_16x64_c
(
src_diff
,
dst_coeff
,
diff_stride
,
DCT_DCT
,
bd
);
break
;
case
IDTX
:
av1_fwd_idtx_c
(
src_diff
,
dst_
coeff
,
diff_stride
,
16
,
64
,
tx_type
);
av1_fwd_idtx_c
(
src_diff
,
coeff
,
diff_stride
,
16
,
64
,
tx_type
);
break
;
default:
assert
(
0
);
break
;
}
...
...
@@ -528,7 +528,7 @@ static void highbd_fwd_txfm_64x16(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x16_c
(
src_diff
,
dst_coeff
,
diff_stride
,
DCT_DCT
,
bd
);
break
;
case
IDTX
:
av1_fwd_idtx_c
(
src_diff
,
dst_
coeff
,
diff_stride
,
64
,
16
,
tx_type
);
av1_fwd_idtx_c
(
src_diff
,
coeff
,
diff_stride
,
64
,
16
,
tx_type
);
break
;
default:
assert
(
0
);
break
;
}
...
...
@@ -566,7 +566,7 @@ static void highbd_fwd_txfm_64x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x64_c
(
src_diff
,
dst_coeff
,
diff_stride
,
DCT_DCT
,
bd
);
break
;
case
IDTX
:
av1_fwd_idtx_c
(
src_diff
,
dst_
coeff
,
diff_stride
,
64
,
64
,
tx_type
);
av1_fwd_idtx_c
(
src_diff
,
coeff
,
diff_stride
,
64
,
64
,
tx_type
);
break
;
default:
assert
(
0
);
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment