[x264-devel] commit: Fix subpel iteration counts with B-frame analysis and subme 6/8 ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed Feb  3 18:36:44 2010 -0800| [da9b9d33425f0492235129ae8937fa7edd64e0a6] | committer: Jason Garrett-Glaser 

Fix subpel iteration counts with B-frame analysis and subme 6/8
Since subme 6 means "like subme 5, except RD on P-frames", B-frame analysis
shouldn't use the RD subpel counts at subme 6.  Similarly with subme 8.
Slightly faster (and very marginally worse) compression at subme 6 and 8.

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

 encoder/analyse.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 92d6584..c15bf8f 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -362,6 +362,8 @@ static void x264_mb_analyse_init( x264_t *h, x264_mb_analysis_t *a, int i_qp )
 
     h->mb.i_me_method = h->param.analyse.i_me_method;
     h->mb.i_subpel_refine = h->param.analyse.i_subpel_refine;
+    if( h->sh.i_type == SLICE_TYPE_B && (h->mb.i_subpel_refine == 6 || h->mb.i_subpel_refine == 8) )
+        h->mb.i_subpel_refine--;
     h->mb.b_chroma_me = h->param.analyse.b_chroma_me && h->sh.i_type == SLICE_TYPE_P
                         && h->mb.i_subpel_refine >= 5;
     h->mb.b_dct_decimate = h->sh.i_type == SLICE_TYPE_B ||