[FFmpeg-cvslog] vp9: drop support for real (non-emulated) edges

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Dec 20 11:20:24 2013 +0100| [ca96e337169093979d7c763064ad9dae12b3108c] | committer: Anton Khirnov

vp9: drop support for real (non-emulated) edges

They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca96e337169093979d7c763064ad9dae12b3108c
---

 libavcodec/vp9block.c |    4 ++--
 tests/fate/vpx.mak    |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c
index e686593..caf3bcc 100644
--- a/libavcodec/vp9block.c
+++ b/libavcodec/vp9block.c
@@ -1583,9 +1583,9 @@ int ff_vp9_decode_block(AVCodecContext *avctx, int row, int col,
      * This allows to support emu-edge and so on even if we have large
      * block overhangs. */
     emu[0] = (col + w4) * 8 > s->cur_frame->linesize[0] ||
-             (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE);
+             (row + h4) > s->rows;
     emu[1] = (col + w4) * 4 > s->cur_frame->linesize[1] ||
-             (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE);
+             (row + h4) > s->rows;
     if (emu[0]) {
         b->dst[0]   = s->tmp_y;
         b->y_stride = 64;
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index d1ed374..f969738 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -78,7 +78,6 @@ $(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
 endef
 
 $(eval $(call FATE_VP9_FULL))
-$(eval $(call FATE_VP9_FULL,-emu-edge,-flags +emu_edge))
 
 FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes)
 fate-vp9: $(FATE_VP9-yes)