commit 02e43d78bf13276ef18fd542167e1ca26830a2f4
author Pierre Ossman <ossman@cendio.se> Thu Mar 05 11:57:11 2009 +0000
committer Pierre Ossman <ossman@cendio.se> Thu Mar 05 11:57:11 2009 +0000
tree 9e4c69ff64d17ee9b85ec5e2c300ce704453ecaa
parent b39ace5b32d5a52280198bef0e8bd8a6c5edacba

Remove the "video" feature and its associated custom JPEG handling.

Having the client specifiy the video region is conceptually wrong
and a problem like this should be handled by better encoding selection.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3635 3789f03b-4d11-0410-bbf8-ca57d06f2519

common/rfb/UpdateTracker.h

diff --git a/common/rfb/UpdateTracker.h b/common/rfb/UpdateTracker.h
index 9cd99ab..8e96d55 100644
--- a/common/rfb/UpdateTracker.h
+++ b/common/rfb/UpdateTracker.h
@@ -30,15 +30,14 @@
     Region changed;
     Region copied;
     Point copy_delta;
-    Rect video_area;
     bool is_empty() const {
-      return copied.is_empty() && changed.is_empty() && video_area.is_empty();
+      return copied.is_empty() && changed.is_empty();
     }
     // NOTE: We do not ever use UpdateInfo::numRects(), because Tight encoding
     //       complicates computing the number of rectangles.
     /*
     int numRects() const {
-      return copied.numRects() + changed.numRects() + !video_area.is_empty();
+      return copied.numRects() + changed.numRects();
     }
     */
   };
@@ -50,7 +49,6 @@
 
     virtual void add_changed(const Region &region) = 0;
     virtual void add_copied(const Region &dest, const Point &delta) = 0;
-    virtual void set_video_area(const Rect &rect) = 0;
   };
 
   class ClippingUpdateTracker : public UpdateTracker {
@@ -63,7 +61,6 @@
 
     virtual void add_changed(const Region &region);
     virtual void add_copied(const Region &dest, const Point &delta);
-    virtual void set_video_area(const Rect &rect);
   protected:
     UpdateTracker* ut;
     Rect clipRect;
@@ -78,49 +75,26 @@
 
     virtual void add_changed(const Region &region);
     virtual void add_copied(const Region &dest, const Point &delta);
-    virtual void set_video_area(const Rect &rect);
     virtual void subtract(const Region& region);
 
     // Fill the supplied UpdateInfo structure with update information
     // FIXME: Provide getUpdateInfo() with no clipping, for better efficiency.
     virtual void getUpdateInfo(UpdateInfo* info, const Region& cliprgn);
 
-    // Get coordinates of the video rectangle
-    virtual const Rect& getVideoArea() const {
-      return video_area;
-    }
-
     // Copy the contained updates to another tracker
     virtual void copyTo(UpdateTracker* to) const;
 
     // Move the entire update region by an offset
-    void translate(const Point& p) {
-      changed.translate(p);
-      copied.translate(p);
-      video_area.translate(p);
-    }
+    void translate(const Point& p) {changed.translate(p); copied.translate(p);}
 
-    virtual bool is_empty() const {
-      return changed.is_empty() && copied.is_empty() && video_area.is_empty();
-    }
+    virtual bool is_empty() const {return changed.is_empty() && copied.is_empty();}
 
-    // NOTE: We do not clear video_area intentionally.
-    virtual void clear() {
-      changed.clear();
-      copied.clear();
-    }
-
+    virtual void clear() {changed.clear(); copied.clear();};
   protected:
     Region changed;
     Region copied;
     Point copy_delta;
     bool copy_enabled;
-
-    // We can track one rectangle on the screen as a "video area". We assume
-    // it is changing continuously, in whole. Thus, we don't need to detect
-    // and track individual changes in the video area -- we can assume it's
-    // always in the changed state.
-    Rect video_area;
   };
 
 }