summaryrefslogtreecommitdiff
path: root/libavcodec/cavs.h
diff options
context:
space:
mode:
authorStefan Gehrer <stefan.gehrer@gmx.de>2007-07-07 06:34:30 +0000
committerStefan Gehrer <stefan.gehrer@gmx.de>2007-07-07 06:34:30 +0000
commit07caa46e997ccb445b61e14366686dc6c6ae5391 (patch)
tree3de9406935fed7ad7e59dd03c54becd43305d285 /libavcodec/cavs.h
parent8a35c8e71aa285c9ad19837307e5f93c97306885 (diff)
downloadffmpeg-07caa46e997ccb445b61e14366686dc6c6ae5391.tar.gz
setting special motion vectors in intra macroblocks
is now in its own inline function Originally committed as revision 9516 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cavs.h')
-rw-r--r--libavcodec/cavs.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index b30f0aca61..aceb3b9e49 100644
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -228,6 +228,7 @@ extern const int_fast8_t ff_left_modifier_l[8];
extern const int_fast8_t ff_top_modifier_l[8];
extern const int_fast8_t ff_left_modifier_c[7];
extern const int_fast8_t ff_top_modifier_c[7];
+extern const vector_t ff_cavs_intra_mv;
extern const vector_t ff_cavs_un_mv;
static inline void load_intra_pred_luma(AVSContext *h, uint8_t *top,
@@ -344,6 +345,16 @@ static inline void set_mvs(vector_t *mv, enum block_t size) {
}
}
+static inline void set_mv_intra(AVSContext *h) {
+ h->mv[MV_FWD_X0] = ff_cavs_intra_mv;
+ set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);
+ h->mv[MV_BWD_X0] = ff_cavs_intra_mv;
+ set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
+ if(h->pic_type != FF_B_TYPE)
+ *h->col_type = I_8X8;
+}
+
+
/**
* initialise predictors for motion vectors and intra prediction
*/