From 086bfd256e3150ad37bc115a46a3b4580d4de574 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 4 Jun 2006 21:54:58 +0000
Subject: [PATCH] support doing motion estimation and compensation without any
residual transform or coding this is usefull for filters which need ME/MC
Originally committed as revision 5456 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/avcodec.h | 1 +
libavcodec/snow.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index eb0fe818569..9dd7d83ef19 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -343,6 +343,7 @@ extern int motion_estimation_method;
#define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters
#define CODEC_FLAG2_BRDO 0x00000400 ///< b-frame rate-distortion optimization
#define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< use MPEG-2 intra VLC table
+#define CODEC_FLAG2_MEMC_ONLY 0x00001000 ///< only do ME/MC (I frames -> ref, P frame -> ME+MC)
/* Unsupported options :
* Syntax Arithmetic coding (SAC)
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index d20b9604ba5..5bd7623ab52 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -4261,6 +4261,7 @@ redo_frame:
int x, y;
// int bits= put_bits_count(&s->c.pb);
+ if(!(avctx->flags2 & CODEC_FLAG2_MEMC_ONLY)){
//FIXME optimize
if(pict->data[plane_index]) //FIXME gray hack
for(y=0; y<h; y++){
@@ -4330,6 +4331,20 @@ redo_frame:
{START_TIMER
predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
STOP_TIMER("pred-conv")}
+ }else{
+ //ME/MC only
+ if(pict->pict_type == I_TYPE){
+ for(y=0; y<h; y++){
+ for(x=0; x<w; x++){
+ s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x]=
+ pict->data[plane_index][y*pict->linesize[plane_index] + x];
+ }
+ }
+ }else{
+ memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
+ predict_plane(s, s->spatial_dwt_buffer, plane_index, 1);
+ }
+ }
if(s->avctx->flags&CODEC_FLAG_PSNR){
int64_t error= 0;
--
GitLab