[prev in list] [next in list] [prev in thread] [next in thread]
List: dirac-commits
Subject: [Dirac-commits] compress/libdirac_motionest me_mode_decn.cpp, 1.31,
From: Anuradha Suraparaju <asuraparaju () users ! sourceforge ! net>
Date: 2008-08-27 0:20:54
Message-ID: E1KY8mM-0007WJ-Tt () mail ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/dirac/compress/libdirac_motionest
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21264/libdirac_motionest
Modified Files:
me_mode_decn.cpp me_mode_decn.h me_subpel.cpp me_subpel.h
pixel_match.cpp pixel_match.h
Log Message:
Re-enabled adaptive block sizes, now a subgroup or so in arrears.
Author: Thomas Davies <thomas.davies@bbc.co.uk>
Index: me_mode_decn.h
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/me_mode_decn.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** me_mode_decn.h 27 Aug 2008 00:17:11 -0000 1.16
--- me_mode_decn.h 27 Aug 2008 00:20:52 -0000 1.17
***************
*** 77,81 ****
estimation must be performed for these levels.
*/
! ModeDecider(const EncoderParams& encp );
//! Destructor
--- 77,81 ----
estimation must be performed for these levels.
*/
! ModeDecider(const PicturePredParams& ppp );
//! Destructor
Index: pixel_match.cpp
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/pixel_match.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pixel_match.cpp 27 Aug 2008 00:18:55 -0000 1.18
--- pixel_match.cpp 27 Aug 2008 00:20:52 -0000 1.19
***************
*** 53,58 ****
PixelMatcher::PixelMatcher( const EncoderParams& encp):
! m_encparams(encp),
! m_predparams(encp.GetPicPredParams())
{}
--- 53,57 ----
PixelMatcher::PixelMatcher( const EncoderParams& encp):
! m_encparams(encp)
{}
***************
*** 60,63 ****
--- 59,63 ----
void PixelMatcher::DoSearch( EncQueue& my_buffer, int pic_num )
{
+ m_predparams = &(my_buffer.GetPicture(pic_num).GetMEData().GetPicPredParams() );
//does an initial search using hierarchical matching to get guide vectors
***************
*** 188,192 ****
int xnumblocks , ynumblocks;
! const OLBParams bparams = m_predparams.LumaBParams(2);
// We might not have an integral number of Macroblocks and blocks in
--- 188,192 ----
int xnumblocks , ynumblocks;
! const OLBParams bparams = m_predparams->LumaBParams(2);
// We might not have an integral number of Macroblocks and blocks in
***************
*** 194,201 ****
// full size picture and calculate the number of in the downsized pics
// from this.
! xnumblocks = m_predparams.XNumBlocks();
! ynumblocks = m_predparams.YNumBlocks();
! PicturePredParams predparams = m_predparams;
predparams.SetXNumMB(0);
predparams.SetYNumMB(0);
--- 194,201 ----
// full size picture and calculate the number of in the downsized pics
// from this.
! xnumblocks = m_predparams->XNumBlocks();
! ynumblocks = m_predparams->YNumBlocks();
! PicturePredParams predparams = *m_predparams;
predparams.SetXNumMB(0);
predparams.SetYNumMB(0);
***************
*** 284,288 ****
// Provide a block matching object to do the work
BlockMatcher my_bmatch( pic_data , ref_data ,
! m_predparams.LumaBParams(2) , m_predparams.MVPrecision() ,
mv_array , pred_costs );
--- 284,288 ----
// Provide a block matching object to do the work
BlockMatcher my_bmatch( pic_data , ref_data ,
! m_predparams->LumaBParams(2) , m_predparams->MVPrecision() ,
mv_array , pred_costs );
Index: pixel_match.h
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/pixel_match.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pixel_match.h 27 Aug 2008 00:17:11 -0000 1.10
--- pixel_match.h 27 Aug 2008 00:20:52 -0000 1.11
***************
*** 89,93 ****
//! Local reference to the picture pred params
! const PicturePredParams& m_predparams;
// the depth of the hierarchical match
--- 89,93 ----
//! Local reference to the picture pred params
! const PicturePredParams* m_predparams;
// the depth of the hierarchical match
Index: me_subpel.cpp
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/me_subpel.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** me_subpel.cpp 27 Aug 2008 00:17:11 -0000 1.18
--- me_subpel.cpp 27 Aug 2008 00:20:52 -0000 1.19
***************
*** 44,49 ****
using std::vector;
! SubpelRefine::SubpelRefine(const EncoderParams& encp):
! m_predparams(encp.GetPicPredParams()),
m_nshift(4)
{
--- 44,49 ----
using std::vector;
! SubpelRefine::SubpelRefine(const PicturePredParams& ppp):
! m_predparams(ppp),
m_nshift(4)
{
Index: me_subpel.h
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/me_subpel.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** me_subpel.h 27 Aug 2008 00:17:11 -0000 1.13
--- me_subpel.h 27 Aug 2008 00:20:52 -0000 1.14
***************
*** 63,69 ****
/*!
The constructor initialises the encoder parameters.
! \param cp the parameters used for controlling encoding
*/
! SubpelRefine(const EncoderParams& cp);
//! Destructor
--- 63,69 ----
/*!
The constructor initialises the encoder parameters.
! \param ppp the parameters used for controlling ME/MC
*/
! SubpelRefine(const PicturePredParams& ppp);
//! Destructor
Index: me_mode_decn.cpp
===================================================================
RCS file: /cvsroot/dirac/compress/libdirac_motionest/me_mode_decn.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** me_mode_decn.cpp 27 Aug 2008 00:18:55 -0000 1.31
--- me_mode_decn.cpp 27 Aug 2008 00:20:52 -0000 1.32
***************
*** 45,50 ****
using std::vector;
! ModeDecider::ModeDecider( const EncoderParams& encp):
! m_predparams( encp.GetPicPredParams() ),
m_level_factor(3),
m_mode_factor(3),
--- 45,50 ----
using std::vector;
! ModeDecider::ModeDecider( const PicturePredParams& ppp):
! m_predparams( ppp ),
m_level_factor(3),
m_mode_factor(3),
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Dirac-commits mailing list
Dirac-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dirac-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic