Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
libvpx
Commits
c3c21e3c
Commit
c3c21e3c
authored
11 years ago
by
Jim Bankoski
Committed by
Gerrit Code Review
11 years ago
Browse files
Options
Download
Patches
Plain Diff
wrap non420 loop filter code in macro
Change-Id: I62bca0e7a4bffc1a78b750dbb9df9d2378e92423
parent
79401542
v1.14.0-linphone
1.4.X
feature/update_to_v1.9.0-linphone
feature/uwp_nuget
forest
frame_parallel
highbitdepth
indianrunnerduck
javanwhistlingduck
khakicampbell
linphone
linphone-android
linphone-old
longtailedduck
m31-baseline
m49-2623
m52-2743
m54-2840
m56-2924
m66-3359
m68-3440
mandarinduck
mcw
mcw2
nextgen
nextgenv2
pcs-2013
playground
sandbox/Jingning/experimental
sandbox/Jingning/transcode
sandbox/Jingning/vpx
sandbox/aconverse@google.com/ansbench
sandbox/debargha/playground
sandbox/hkuang/frame_parallel
sandbox/hkuang@google.com/decode
sandbox/jimbankoski@google.com/proposed-aom
sandbox/jingning@google.com/decoder_test_suite
sandbox/jingning@google.com/experimental
sandbox/jzern@google.com/test
sandbox/wangch@google.com/vp9
sandbox/yaowu@google.com/mergeaom
stable-vp9-decoder
v1.12.0-linphone
v1.6.1_linphone
v1.7.0-linphone
v1.9.0-linphone
v1.9.0
v1.9.0-rc1
v1.8.2
v1.8.1
v1.8.0
v1.7.0
v1.6.1
v1.6.0
v1.5.0
v1.4.0
v1.3.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vp9/common/vp9_loopfilter.c
+10
-0
vp9/common/vp9_loopfilter.c
with
10 additions
and
0 deletions
vp9/common/vp9_loopfilter.c
+
10
−
0
View file @
c3c21e3c
...
@@ -777,6 +777,7 @@ static void setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col,
...
@@ -777,6 +777,7 @@ static void setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col,
}
}
}
}
}
}
#if CONFIG_NON420
static
void
filter_block_plane_non420
(
VP9_COMMON
*
cm
,
static
void
filter_block_plane_non420
(
VP9_COMMON
*
cm
,
struct
macroblockd_plane
*
plane
,
struct
macroblockd_plane
*
plane
,
const
MODE_INFO
*
mi
,
const
MODE_INFO
*
mi
,
...
@@ -896,6 +897,7 @@ static void filter_block_plane_non420(VP9_COMMON *cm,
...
@@ -896,6 +897,7 @@ static void filter_block_plane_non420(VP9_COMMON *cm,
dst
->
buf
+=
8
*
dst
->
stride
;
dst
->
buf
+=
8
*
dst
->
stride
;
}
}
}
}
#endif
static
void
filter_block_plane
(
VP9_COMMON
*
const
cm
,
static
void
filter_block_plane
(
VP9_COMMON
*
const
cm
,
struct
macroblockd_plane
*
const
plane
,
struct
macroblockd_plane
*
const
plane
,
...
@@ -981,8 +983,10 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
...
@@ -981,8 +983,10 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
const
int
num_planes
=
y_only
?
1
:
MAX_MB_PLANE
;
const
int
num_planes
=
y_only
?
1
:
MAX_MB_PLANE
;
int
mi_row
,
mi_col
;
int
mi_row
,
mi_col
;
LOOP_FILTER_MASK
lfm
;
LOOP_FILTER_MASK
lfm
;
#if CONFIG_NON420
int
use_420
=
y_only
||
(
xd
->
plane
[
1
].
subsampling_y
==
1
&&
int
use_420
=
y_only
||
(
xd
->
plane
[
1
].
subsampling_y
==
1
&&
xd
->
plane
[
1
].
subsampling_x
==
1
);
xd
->
plane
[
1
].
subsampling_x
==
1
);
#endif
for
(
mi_row
=
start
;
mi_row
<
stop
;
mi_row
+=
MI_BLOCK_SIZE
)
{
for
(
mi_row
=
start
;
mi_row
<
stop
;
mi_row
+=
MI_BLOCK_SIZE
)
{
MODE_INFO
*
const
mi
=
cm
->
mi
+
mi_row
*
cm
->
mode_info_stride
;
MODE_INFO
*
const
mi
=
cm
->
mi
+
mi_row
*
cm
->
mode_info_stride
;
...
@@ -993,16 +997,22 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
...
@@ -993,16 +997,22 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
setup_dst_planes
(
xd
,
frame_buffer
,
mi_row
,
mi_col
);
setup_dst_planes
(
xd
,
frame_buffer
,
mi_row
,
mi_col
);
// TODO(JBB): Make setup_mask work for non 420.
// TODO(JBB): Make setup_mask work for non 420.
#if CONFIG_NON420
if
(
use_420
)
if
(
use_420
)
#endif
setup_mask
(
cm
,
mi_row
,
mi_col
,
mi
+
mi_col
,
cm
->
mode_info_stride
,
&
lfm
);
setup_mask
(
cm
,
mi_row
,
mi_col
,
mi
+
mi_col
,
cm
->
mode_info_stride
,
&
lfm
);
for
(
plane
=
0
;
plane
<
num_planes
;
++
plane
)
{
for
(
plane
=
0
;
plane
<
num_planes
;
++
plane
)
{
#if CONFIG_NON420
if
(
use_420
)
if
(
use_420
)
#endif
filter_block_plane
(
cm
,
&
xd
->
plane
[
plane
],
mi
+
mi_col
,
mi_row
,
mi_col
,
filter_block_plane
(
cm
,
&
xd
->
plane
[
plane
],
mi
+
mi_col
,
mi_row
,
mi_col
,
&
lfm
);
&
lfm
);
#if CONFIG_NON420
else
else
filter_block_plane_non420
(
cm
,
&
xd
->
plane
[
plane
],
mi
+
mi_col
,
filter_block_plane_non420
(
cm
,
&
xd
->
plane
[
plane
],
mi
+
mi_col
,
mi_row
,
mi_col
);
mi_row
,
mi_col
);
#endif
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets