summaryrefslogtreecommitdiff
path: root/vp8/common/postproc.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2012-03-22 09:13:18 -0700
committerDeb Mukherjee <debargha@google.com>2012-03-22 09:55:07 -0700
commit66ba79f5fb8ec3f729903f8a5edcfef93a663ce6 (patch)
tree7c7a3672eee120533d7de77ae8d704fbba5bae83 /vp8/common/postproc.c
parentfd9df44a054260aef0aaf3d8acda61d35e3b001b (diff)
downloadlibvpx-66ba79f5fb8ec3f729903f8a5edcfef93a663ce6.tar
libvpx-66ba79f5fb8ec3f729903f8a5edcfef93a663ce6.tar.gz
libvpx-66ba79f5fb8ec3f729903f8a5edcfef93a663ce6.tar.bz2
libvpx-66ba79f5fb8ec3f729903f8a5edcfef93a663ce6.zip
Miscellaneous changes in mfqe and postproc modules
Adds logic to disable mfqe for the first frame after a configuration change such as change in resolution. Also adds some missing if CONFIG_POSTPROC macro checks. Change-Id: If29053dad50b676bd29189ab7f9fe250eb5d30b3
Diffstat (limited to 'vp8/common/postproc.c')
-rw-r--r--vp8/common/postproc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index cc0d9f80b..225c87268 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -693,7 +693,7 @@ static void constrain_line (int x0, int *x1, int y0, int *y1, int width, int hei
}
}
-
+#if CONFIG_POSTPROC
int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *ppflags)
{
int q = oci->filter_level * 10 / 6;
@@ -716,6 +716,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t
dest->y_height = oci->Height;
dest->uv_height = dest->y_height / 2;
oci->postproc_state.last_base_qindex = oci->base_qindex;
+ oci->postproc_state.last_frame_valid = 1;
return 0;
}
@@ -746,6 +747,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t
#endif
if ((flags & VP8D_MFQE) &&
+ oci->postproc_state.last_frame_valid &&
oci->current_video_frame >= 2 &&
oci->base_qindex - oci->postproc_state.last_base_qindex >= 10)
{
@@ -785,6 +787,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t
vp8_yv12_copy_frame_ptr(oci->frame_to_show, &oci->post_proc_buffer);
oci->postproc_state.last_base_qindex = oci->base_qindex;
}
+ oci->postproc_state.last_frame_valid = 1;
if (flags & VP8D_ADDNOISE)
{
@@ -1171,3 +1174,4 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t
dest->uv_height = dest->y_height / 2;
return 0;
}
+#endif