rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / asset.h

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index b877c47d938d1ccfb29184c673ceb12116f9da80..80a29eb5cc33c48b84778abf8ef01679ea71168d 100644 (file)
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -146,6 +146,8 @@ public:
 
        int actual_width, actual_height;
        int width, height;
 
        int actual_width, actual_height;
        int width, height;

+// scale factor or 0 if not proxy
+       int proxy_scale;

 // String or FourCC describing compression
        char vcodec[BCTEXTLEN];
 
 // String or FourCC describing compression
        char vcodec[BCTEXTLEN];
 


@@ -163,28 +165,11 @@ public:
 // 2 - 3
        int ampeg_derivative;
 
 // 2 - 3
        int ampeg_derivative;
 

-// Vorbis compression
-       int vorbis_min_bitrate;
-       int vorbis_bitrate;
-       int vorbis_max_bitrate;
-       int vorbis_vbr;
-
-// Theora compression
-       int theora_fix_bitrate;
-       int theora_bitrate;
-       int theora_quality;
-       int theora_sharpness;
-       int theora_keyframe_frequency;
-       int theora_keyframe_force_frequency;
-
-

 // Set by package render during file creation. -1 means square pixels.
        double aspect_ratio;
 
 // for the interlace mode
 // Set by package render during file creation. -1 means square pixels.
        double aspect_ratio;
 
 // for the interlace mode

-       int interlace_autofixoption;

        int interlace_mode;
        int interlace_mode;

-       int interlace_fixmethod;

 // for jpeg compression
        int jpeg_quality;
 
 // for jpeg compression
        int jpeg_quality;