[Sumover-dev] [svn commit] r4104 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Oct  9 12:36:50 2007
New Revision: 4104

Modified:
   vic/branches/mpeg4/video/grabber-win32DS.cpp
   vic/branches/mpeg4/video/grabber.cpp

Log:
Fix for "Large" transmission - it may not work for all situations but it works in my test environment. Basically the set_size_cif() call drops thru to set_size_411() if there's now matching resolutions. VIC was crashing as it attempted to delete framebase_ twice - I fixed it by setting framebase_=0 so delete doesn't fail (it just skips it).

Modified: vic/branches/mpeg4/video/grabber-win32DS.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.cpp	Tue Oct  9 12:36:50 2007
@@ -885,7 +885,7 @@
 	  max_height_ = D1_BASE_HEIGHT;
    }
 
-   if(decimate_ == 1){
+   if(decimate_ == 1){  //i.e. Large 
        width_ = max_width_;
        height_ = max_height_;
    } else {

Modified: vic/branches/mpeg4/video/grabber.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber.cpp	(original)
+++ vic/branches/mpeg4/video/grabber.cpp	Tue Oct  9 12:36:50 2007
@@ -450,6 +450,7 @@
 void Grabber::set_size_cif(int w, int h)
 {
 	delete[] framebase_; //SV-XXX: Debian
+        framebase_ = 0;
 	inw_ = w;
 	inh_ = h;