Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
dfc03852
Commit
dfc03852
authored
Jun 18, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jun 18, 2013
Browse files
Merge "Removing vp9_invtrans.{c, h} files."
parents
95247655
686b9974
Changes
7
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_invtrans.c
deleted
100644 → 0
View file @
95247655
/*
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include
"vp9/common/vp9_invtrans.h"
#include
"./vp9_rtcd.h"
void
vp9_inverse_transform_b_4x4_add
(
MACROBLOCKD
*
xd
,
int
eob
,
int16_t
*
dqcoeff
,
uint8_t
*
dest
,
int
stride
)
{
if
(
eob
<=
1
)
xd
->
inv_txm4x4_1_add
(
dqcoeff
,
dest
,
stride
);
else
xd
->
inv_txm4x4_add
(
dqcoeff
,
dest
,
stride
);
}
vp9/common/vp9_invtrans.h
deleted
100644 → 0
View file @
95247655
/*
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP9_COMMON_VP9_INVTRANS_H_
#define VP9_COMMON_VP9_INVTRANS_H_
#include
"./vpx_config.h"
#include
"vpx/vpx_integer.h"
#include
"vp9/common/vp9_blockd.h"
void
vp9_inverse_transform_b_4x4_add
(
MACROBLOCKD
*
xd
,
int
eob
,
int16_t
*
dqcoeff
,
uint8_t
*
dest
,
int
stride
);
#endif // VP9_COMMON_VP9_INVTRANS_H_
vp9/decoder/vp9_decodframe.c
View file @
dfc03852
...
...
@@ -20,7 +20,6 @@
#include
"vp9/common/vp9_reconintra.h"
#include
"vp9/common/vp9_reconinter.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vp9/common/vp9_invtrans.h"
#include
"vp9/common/vp9_alloccommon.h"
#include
"vp9/common/vp9_entropymode.h"
#include
"vp9/common/vp9_quant_common.h"
...
...
vp9/encoder/vp9_encodeframe.c
View file @
dfc03852
...
...
@@ -23,7 +23,6 @@
#include
"vp9/encoder/vp9_segmentation.h"
#include
"vp9/encoder/vp9_encodeintra.h"
#include
"vp9/common/vp9_reconinter.h"
#include
"vp9/common/vp9_invtrans.h"
#include
"vp9/encoder/vp9_rdopt.h"
#include
"vp9/common/vp9_findnearmv.h"
#include
"vp9/common/vp9_reconintra.h"
...
...
vp9/encoder/vp9_encodeintra.c
View file @
dfc03852
...
...
@@ -13,7 +13,6 @@
#include
"vp9/encoder/vp9_quantize.h"
#include
"vp9/common/vp9_reconintra.h"
#include
"vp9/encoder/vp9_encodemb.h"
#include
"vp9/common/vp9_invtrans.h"
#include
"vp9/encoder/vp9_encodeintra.h"
int
vp9_encode_intra
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
int
use_16x16_pred
)
{
...
...
vp9/encoder/vp9_encodemb.c
View file @
dfc03852
...
...
@@ -13,7 +13,6 @@
#include
"vp9/common/vp9_reconinter.h"
#include
"vp9/encoder/vp9_quantize.h"
#include
"vp9/encoder/vp9_tokenize.h"
#include
"vp9/common/vp9_invtrans.h"
#include
"vp9/common/vp9_reconintra.h"
#include
"vpx_mem/vpx_mem.h"
#include
"vp9/encoder/vp9_rdopt.h"
...
...
@@ -39,6 +38,15 @@ void vp9_subtract_block(int rows, int cols,
}
}
static
void
inverse_transform_b_4x4_add
(
MACROBLOCKD
*
xd
,
int
eob
,
int16_t
*
dqcoeff
,
uint8_t
*
dest
,
int
stride
)
{
if
(
eob
<=
1
)
xd
->
inv_txm4x4_1_add
(
dqcoeff
,
dest
,
stride
);
else
xd
->
inv_txm4x4_add
(
dqcoeff
,
dest
,
stride
);
}
static
void
subtract_plane
(
MACROBLOCK
*
x
,
BLOCK_SIZE_TYPE
bsize
,
int
plane
)
{
struct
macroblock_plane
*
const
p
=
&
x
->
plane
[
plane
];
...
...
@@ -527,8 +535,8 @@ static void encode_block(int plane, int block, BLOCK_SIZE_TYPE bsize,
// this is like vp9_short_idct4x4 but has a special case around eob<=1
// which is significant (not just an optimization) for the lossless
// case.
vp9_
inverse_transform_b_4x4_add
(
xd
,
pd
->
eobs
[
block
],
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
inverse_transform_b_4x4_add
(
xd
,
pd
->
eobs
[
block
],
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
vp9_short_iht4x4_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
tx_type
);
break
;
...
...
@@ -667,8 +675,8 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize,
// this is like vp9_short_idct4x4 but has a special case around eob<=1
// which is significant (not just an optimization) for the lossless
// case.
vp9_
inverse_transform_b_4x4_add
(
xd
,
pd
->
eobs
[
block
],
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
inverse_transform_b_4x4_add
(
xd
,
pd
->
eobs
[
block
],
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
vp9_short_iht4x4_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
tx_type
);
break
;
...
...
vp9/vp9_common.mk
View file @
dfc03852
...
...
@@ -38,7 +38,6 @@ VP9_COMMON_SRCS-yes += common/vp9_enums.h
VP9_COMMON_SRCS-yes
+=
common/vp9_extend.h
VP9_COMMON_SRCS-yes
+=
common/vp9_findnearmv.h
VP9_COMMON_SRCS-yes
+=
common/vp9_idct.h
VP9_COMMON_SRCS-yes
+=
common/vp9_invtrans.h
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter.h
VP9_COMMON_SRCS-yes
+=
common/vp9_modecont.h
VP9_COMMON_SRCS-yes
+=
common/vp9_mv.h
...
...
@@ -59,7 +58,6 @@ VP9_COMMON_SRCS-yes += common/vp9_textblit.h
VP9_COMMON_SRCS-yes
+=
common/vp9_tile_common.h
VP9_COMMON_SRCS-yes
+=
common/vp9_tile_common.c
VP9_COMMON_SRCS-yes
+=
common/vp9_treecoder.h
VP9_COMMON_SRCS-yes
+=
common/vp9_invtrans.c
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter.c
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter_filters.c
VP9_COMMON_SRCS-yes
+=
common/vp9_mbpitch.c
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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