Credit Terje with 2 new render formats + reverse titler and blur MAX_FLT causing...

diff --git a/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.m2ts b/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.m2ts
new file mode 100644 (file)
index 0000000..f27c1f0
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.m2ts
@@ -0,0 +1,11 @@
+mpegts mpeg2video
+cin_pix_fmt=yuv422p
+b=30M
+dc=10
+muxrate=35M
+minrate=30M
+maxrate=30M
+bufsize=25M
+bf=2
+profile=422p
+refs=1

diff --git a/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.mkv b/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.mkv
new file mode 100644 (file)
index 0000000..3ef7684
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/mpeg2sd422p.mkv
@@ -0,0 +1,8 @@
+matroska mpeg2video
+cin_pix_fmt=yuv422p
+b=30M
+muxrate=35M
+minrate=30M
+maxrate=30M
+bufsize=25M
+profile=422p

diff --git a/cinelerra-5.1/plugins/blur/blur.C b/cinelerra-5.1/plugins/blur/blur.C
index ad99c4a66f06cb975be952ecfdddbfb9be68ff8c..896cddbb1350b331d392149b0845c467376c607e 100644 (file)
--- a/cinelerra-5.1/plugins/blur/blur.C
+++ b/cinelerra-5.1/plugins/blur/blur.C
@@ -32,7 +32,7 @@
 #include <string.h>
 
 
 #include <string.h>
 
 

-#define MAX_FLT  3.40282347e+38
+

 
 
 #define MIN_RADIUS 2
 
 
 #define MIN_RADIUS 2


@@ -571,7 +571,7 @@ void BlurEngine::run()
                                break;
 
                        case BC_RGB_FLOAT:
                                break;
 
                        case BC_RGB_FLOAT:

-                               BLUR(float, MAX_FLT, 3);
+                               BLUR(float, 1.0, 3);

                                break;
 
                        case BC_RGBA8888:
                                break;
 
                        case BC_RGBA8888:


@@ -580,7 +580,7 @@ void BlurEngine::run()
                                break;
 
                        case BC_RGBA_FLOAT:
                                break;
 
                        case BC_RGBA_FLOAT:

-                               BLUR(float, MAX_FLT, 4);
+                               BLUR(float, 1.0, 4);

                                break;
 
                        case BC_RGB161616:
                                break;
 
                        case BC_RGB161616:

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index 7ebbfaec61957d4ec1498dc26fcc5c48502f685d..b415781106b77ecf9164ffdc62d4941c0a09bae1 100644 (file)
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -2306,9 +2306,9 @@ void TitleTranslateUnit::process_package(LoadPackage *package)
 
        switch( output->get_color_model() ) {
        case BC_RGB888:     TRANSLATE(unsigned char, 0xff, 3, 0);    break;
 
        switch( output->get_color_model() ) {
        case BC_RGB888:     TRANSLATE(unsigned char, 0xff, 3, 0);    break;

-       case BC_RGB_FLOAT:  TRANSLATE(float, MAX_FLT, 3, 0);             break;
+       case BC_RGB_FLOAT:  TRANSLATE(float, 1.0, 3, 0);             break;

        case BC_YUV888:     TRANSLATE(unsigned char, 0xff, 3, 0x80); break;
        case BC_YUV888:     TRANSLATE(unsigned char, 0xff, 3, 0x80); break;

-       case BC_RGBA_FLOAT: TRANSLATE(float, MAX_FLT, 4, 0);             break;
+       case BC_RGBA_FLOAT: TRANSLATE(float, 1.0, 4, 0);             break;

        case BC_RGBA8888:   TRANSLATE(unsigned char, 0xff, 4, 0);    break;
        case BC_YUVA8888:   TRANSLATE(unsigned char, 0xff, 4, 0x80); break;
        }
        case BC_RGBA8888:   TRANSLATE(unsigned char, 0xff, 4, 0);    break;
        case BC_YUVA8888:   TRANSLATE(unsigned char, 0xff, 4, 0x80); break;
        }