  
  #define FRAME_BUF_COUNT 16
  
  typedef struct CameraState {
    int camera_id;
    CameraInfo ci;
  
    int fps;
    float digital_gain;
  
 
</s> remove 
  float cur_gain_frac;

 </s> add  </s> remove   int ispif_fd;

 </s> add 
  
  #define FRAME_BUF_COUNT 16
  
  typedef struct CameraState {

    CameraInfo ci;
  
    int fps;
    float digital_gain;
  
keep keep keep keep replace keep keep keep keep keep
 webcam cleanup: remove unused variables (#2450) 
selfdrive/camerad/cameras/camera_webcam.h