Mercurial > libavcodec.hg

diff arm/h264pred_init_arm.c @ 11918:823f332655e8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add intra prediction functions for VP8. Patch by David Conrad <lessen42 gmail com> and myself.
author rbultje
date Tue, 22 Jun 2010 19:17:09 +0000
parents 21566c95834c
children f021be0e837c
line wrap: on
line diff
--- a/arm/h264pred_init_arm.c	Tue Jun 22 19:15:27 2010 +0000
+++ b/arm/h264pred_init_arm.c	Tue Jun 22 19:17:09 2010 +0000
@@ -46,9 +46,10 @@
 {
     h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
     h->pred8x8[HOR_PRED8x8      ] = ff_pred8x8_hor_neon;
+    if (codec_id != CODEC_ID_VP8)
     h->pred8x8[PLANE_PRED8x8    ] = ff_pred8x8_plane_neon;
     h->pred8x8[DC_128_PRED8x8   ] = ff_pred8x8_128_dc_neon;
-    if (codec_id != CODEC_ID_RV40) {
+    if (codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) {
         h->pred8x8[DC_PRED8x8     ] = ff_pred8x8_dc_neon;
         h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
         h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
@@ -64,7 +65,7 @@
     h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
     h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
     h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
-    if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40)
+    if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8)
         h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_neon;
 }