---
libavcodec/snow.h | 8 ++++++++
libavcodec/snowdec.c | 8 --------
libavcodec/snowenc.c | 8 --------
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index 831613d..c433579 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -254,6 +254,14 @@ static inline void pred_mv(SnowContext *s, int *mx, int
*my, int ref,
}
}
+static av_always_inline int same_block(BlockNode *a, BlockNode *b){
+ if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
+ return !((a->color[0] - b->color[0]) | (a->color[1] - b->color[1]) |
(a->color[2] - b->color[2]));
+ }else{
+ return !((a->mx - b->mx) | (a->my - b->my) | (a->ref - b->ref) |
((a->type ^ b->type)&BLOCK_INTRA));
+ }
+}
+
/* common code */
void snow_reset_contexts(SnowContext *s);
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 7d891bb..8f19af5 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -283,14 +283,6 @@ static inline void init_ref(MotionEstContext *c, uint8_t
*src[3], uint8_t *ref[3
assert(!ref_index);
}
-static av_always_inline int same_block(BlockNode *a, BlockNode *b){
- if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
- return !((a->color[0] - b->color[0]) | (a->color[1] - b->color[1]) |
(a->color[2] - b->color[2]));
- }else{
- return !((a->mx - b->mx) | (a->my - b->my) | (a->ref - b->ref) |
((a->type ^ b->type)&BLOCK_INTRA));
- }
-}
-
//FIXME name cleanup (b_w, block_w, b_width stuff)
static av_always_inline void add_yblock(SnowContext *s, int sliced,
slice_buffer *sb, IDWTELEM *dst, uint8_t *dst8, const uint8_t *obmc, int src_x,
int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int
obmc_stride, int b_x, int b_y, int add, int offset_dst, int plane_index){
const int b_width = s->b_width << s->block_max_depth;
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index cdf0038..17ba45b 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -283,14 +283,6 @@ static inline void init_ref(MotionEstContext *c, uint8_t
*src[3], uint8_t *ref[3
assert(!ref_index);
}
-static av_always_inline int same_block(BlockNode *a, BlockNode *b){
- if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
- return !((a->color[0] - b->color[0]) | (a->color[1] - b->color[1]) |
(a->color[2] - b->color[2]));
- }else{
- return !((a->mx - b->mx) | (a->my - b->my) | (a->ref - b->ref) |
((a->type ^ b->type)&BLOCK_INTRA));
- }
-}
-
//FIXME name cleanup (b_w, block_w, b_width stuff)
static av_always_inline void add_yblock(SnowContext *s, int sliced,
slice_buffer *sb, IDWTELEM *dst, uint8_t *dst8, const uint8_t *obmc, int src_x,
int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int
obmc_stride, int b_x, int b_y, int add, int offset_dst, int plane_index){
const int b_width = s->b_width << s->block_max_depth;
--
1.7.7
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
