fix audiospect ratio in scale per andrew, upgrade dav1d to 0.6.0, fix shapewipe black...

diff --git a/cinelerra-5.1/cinelerra/canvas.C b/cinelerra-5.1/cinelerra/canvas.C
index 17d5a42b5e952de5b515ccdc1650bde8e76b2484..963c63d84240d6af1fcea3e2fb793f4c9beb759b 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.C
+++ b/cinelerra-5.1/cinelerra/canvas.C
@@ -114,22 +114,6 @@ void Canvas::use_auxwindow(BC_WindowBase *aux)
        canvas_auxwindow = aux;
 }
 
        canvas_auxwindow = aux;
 }
 

-void Canvas::use_cwindow()
-{
-       canvas_menu->use_cwindow();
-       fullscreen_menu->use_cwindow();
-}
-
-void Canvas::use_rwindow()
-{
-       canvas_menu->use_rwindow();
-}
-
-void Canvas::use_vwindow()
-{
-       canvas_menu->use_vwindow();
-}
-

 int Canvas::get_fullscreen()
 {
        return is_fullscreen;
 int Canvas::get_fullscreen()
 {
        return is_fullscreen;


@@ -914,11 +898,6 @@ void CanvasFullScreenPopup::create_objects()
        add_item(new CanvasSubWindowItem(canvas));
 }
 
        add_item(new CanvasSubWindowItem(canvas));
 }
 

-void CanvasFullScreenPopup::use_cwindow()
-{
-       add_item(new CanvasPopupAuto(canvas));
-}
-

 CanvasSubWindowItem::CanvasSubWindowItem(Canvas *canvas)
  : BC_MenuItem(_("Windowed"), "f", 'f')
 {
 CanvasSubWindowItem::CanvasSubWindowItem(Canvas *canvas)
  : BC_MenuItem(_("Windowed"), "f", 'f')
 {


@@ -976,26 +955,6 @@ void CanvasPopup::create_objects()
        submenu->add_submenuitem(new CanvasPopupSize(canvas, _("Zoom 400%"), 4.0));
 }
 
        submenu->add_submenuitem(new CanvasPopupSize(canvas, _("Zoom 400%"), 4.0));
 }
 

-void CanvasPopup::use_cwindow()
-{
-       add_item(new CanvasPopupAuto(canvas));
-       add_item(new CanvasPopupResetCamera(canvas));
-       add_item(new CanvasPopupResetProjector(canvas));
-       add_item(new CanvasPopupCameraKeyframe(canvas));
-       add_item(new CanvasPopupProjectorKeyframe(canvas));
-       add_item(toggle_controls = new CanvasToggleControls(canvas));
-}
-
-void CanvasPopup::use_rwindow()
-{
-       add_item(new CanvasPopupResetTranslation(canvas));
-}
-
-void CanvasPopup::use_vwindow()
-{
-       add_item(new CanvasPopupRemoveSource(canvas));
-}
-

 
 CanvasPopupAuto::CanvasPopupAuto(Canvas *canvas)
  : BC_MenuItem(_("Zoom Auto"))
 
 CanvasPopupAuto::CanvasPopupAuto(Canvas *canvas)
  : BC_MenuItem(_("Zoom Auto"))


@@ -1074,7 +1033,6 @@ int CanvasPopupProjectorKeyframe::handle_event()
 }
 
 
 }
 
 

-

 CanvasPopupResetTranslation::CanvasPopupResetTranslation(Canvas *canvas)
  : BC_MenuItem(_("Reset translation"))
 {
 CanvasPopupResetTranslation::CanvasPopupResetTranslation(Canvas *canvas)
  : BC_MenuItem(_("Reset translation"))
 {


@@ -1087,25 +1045,6 @@ int CanvasPopupResetTranslation::handle_event()
 }
 
 
 }
 
 

-
-CanvasToggleControls::CanvasToggleControls(Canvas *canvas)
- : BC_MenuItem(calculate_text(canvas->get_cwindow_controls()))
-{
-       this->canvas = canvas;
-}
-int CanvasToggleControls::handle_event()
-{
-       canvas->toggle_controls();
-       set_text(calculate_text(canvas->get_cwindow_controls()));
-       return 1;
-}
-
-char* CanvasToggleControls::calculate_text(int cwindow_controls)
-{
-       return !cwindow_controls ? _("Show controls") : _("Hide controls");
-}
-
-

 CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas)
  : BC_MenuItem(_("Fullscreen"), "f", 'f')
 {
 CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas)
  : BC_MenuItem(_("Fullscreen"), "f", 'f')
 {

diff --git a/cinelerra-5.1/cinelerra/canvas.h b/cinelerra-5.1/cinelerra/canvas.h
index 6b336052ae5c7b46613e85170c81e17f179bfb40..dd3b574d05952f4b9c638ddaace21b0abecc9bb0 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.h
+++ b/cinelerra-5.1/cinelerra/canvas.h
@@ -86,10 +86,6 @@ public:
        int cursor_enter_event_base(BC_WindowBase *caller);
        int button_press_event_base(BC_WindowBase *caller);
        int keypress_event(BC_WindowBase *caller);
        int cursor_enter_event_base(BC_WindowBase *caller);
        int button_press_event_base(BC_WindowBase *caller);
        int keypress_event(BC_WindowBase *caller);

-// Use menu different options for different windows
-       void use_cwindow();
-       void use_rwindow();
-       void use_vwindow();

        void use_auxwindow(BC_WindowBase *aux);
 
 // Provide canvas dimensions since a BC_Bitmap containing obsolete dimensions
        void use_auxwindow(BC_WindowBase *aux);
 
 // Provide canvas dimensions since a BC_Bitmap containing obsolete dimensions


@@ -283,8 +279,6 @@ public:
        CanvasFullScreenPopup(Canvas *canvas);
 
        void create_objects();
        CanvasFullScreenPopup(Canvas *canvas);
 
        void create_objects();

-       void use_cwindow();
-

        Canvas *canvas;
 };
 
        Canvas *canvas;
 };
 


@@ -303,12 +297,7 @@ public:
        ~CanvasPopup();
 
        void create_objects();
        ~CanvasPopup();
 
        void create_objects();

-       void use_cwindow();
-       void use_rwindow();
-       void use_vwindow();
-

        Canvas *canvas;
        Canvas *canvas;

-       CanvasToggleControls *toggle_controls;

 };
 
 class CanvasZoomSize : public BC_MenuItem
 };
 
 class CanvasZoomSize : public BC_MenuItem


@@ -377,15 +366,6 @@ public:
        Canvas *canvas;
 };
 
        Canvas *canvas;
 };
 

-class CanvasToggleControls : public BC_MenuItem
-{
-public:
-       CanvasToggleControls(Canvas *canvas);
-       int handle_event();
-       static char* calculate_text(int cwindow_controls);
-       Canvas *canvas;
-};
-

 class CanvasFullScreenItem : public BC_MenuItem
 {
 public:
 class CanvasFullScreenItem : public BC_MenuItem
 {
 public:


@@ -402,7 +382,6 @@ public:
        Canvas *canvas;
 };
 
        Canvas *canvas;
 };
 

-

 class CanvasPopupRemoveSource : public BC_MenuItem
 {
 public:
 class CanvasPopupRemoveSource : public BC_MenuItem
 {
 public:


@@ -411,8 +390,4 @@ public:
        Canvas *canvas;
 };
 
        Canvas *canvas;
 };
 

-
-
-
-

 #endif
 #endif

diff --git a/cinelerra-5.1/cinelerra/canvas.inc b/cinelerra-5.1/cinelerra/canvas.inc
index 899c8e0a6a1da7f62671479f7c9e229ead537fc6..06d02f75155d23607c4026d0168394ba310bd4b0 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.inc
+++ b/cinelerra-5.1/cinelerra/canvas.inc
@@ -38,7 +38,6 @@ class CanvasPopupResetCamera;
 class CanvasPopupResetProjector;
 class CanvasPopupCameraKeyframe;
 class CanvasPopupProjectorKeyframe;
 class CanvasPopupResetProjector;
 class CanvasPopupCameraKeyframe;
 class CanvasPopupProjectorKeyframe;

-class CanvasToggleControls;

 class CanvasFullScreenItem;
 class CanvasPopupResetTranslation;
 class CanvasPopupRemoveSource;
 class CanvasFullScreenItem;
 class CanvasPopupResetTranslation;
 class CanvasPopupRemoveSource;

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 052a713d9a3eb5d831c7666ea464c15829a600c6..c0d64487f0b087dd67b5a5183d6677039f7dd30c 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -163,8 +163,6 @@ void CWindowGUI::create_objects()
        canvas = new CWindowCanvas(mwindow, this);
 
        canvas->create_objects(mwindow->edl);
        canvas = new CWindowCanvas(mwindow, this);
 
        canvas->create_objects(mwindow->edl);

-       canvas->use_cwindow();
-

 
        add_subwindow(timebar = new CTimeBar(mwindow,
                this,
 
        add_subwindow(timebar = new CTimeBar(mwindow,
                this,


@@ -972,6 +970,22 @@ void CWindowTransport::goto_end()
        gui->lock_window("CWindowTransport::goto_end 2");
 }
 
        gui->lock_window("CWindowTransport::goto_end 2");
 }
 

+CWindowCanvasToggleControls::CWindowCanvasToggleControls(CWindowCanvas *canvas)
+ : BC_MenuItem(calculate_text(canvas->get_controls()))
+{
+       this->canvas = canvas;
+}
+int CWindowCanvasToggleControls::handle_event()
+{
+       canvas->toggle_controls();
+       set_text(calculate_text(canvas->get_controls()));
+       return 1;
+}
+
+const char *CWindowCanvasToggleControls::calculate_text(int controls)
+{
+       return !controls ? _("Show controls") : _("Hide controls");
+}

 
 
 CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)
 
 
 CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)


@@ -985,6 +999,19 @@ CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)
        last_xscroll = 0;
        last_yscroll = 0;
        last_zoom = 0;
        last_xscroll = 0;
        last_yscroll = 0;
        last_zoom = 0;

+       controls = 0;
+}
+
+void CWindowCanvas::create_objects(EDL *edl)
+{
+       Canvas::create_objects(edl);
+       canvas_menu->add_item(new CanvasPopupAuto(this));
+       canvas_menu->add_item(new CanvasPopupResetCamera(this));
+       canvas_menu->add_item(new CanvasPopupResetProjector(this));
+       canvas_menu->add_item(new CanvasPopupCameraKeyframe(this));
+       canvas_menu->add_item(new CanvasPopupProjectorKeyframe(this));
+       canvas_menu->add_item(controls = new CWindowCanvasToggleControls(this));
+       fullscreen_menu->add_item(new CanvasPopupAuto(this));

 }
 
 void CWindowCanvas::status_event()
 }
 
 void CWindowCanvas::status_event()


@@ -3373,7 +3400,7 @@ void CWindowCanvas::toggle_controls()
        gui->resize_event(gui->get_w(), gui->get_h());
 }
 
        gui->resize_event(gui->get_w(), gui->get_h());
 }
 

-int CWindowCanvas::get_cwindow_controls()
+int CWindowCanvas::get_controls()

 {
        return mwindow->session->cwindow_controls;
 }
 {
        return mwindow->session->cwindow_controls;
 }

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 14e0ebfe3285981c28c53c47695769e837950b72..fad225f328df8fd42a3347264b5c2e48f55ecf25 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -27,6 +27,7 @@
 #include "cpanel.inc"
 #include "ctimebar.inc"
 #include "cwindow.inc"
 #include "cpanel.inc"
 #include "ctimebar.inc"
 #include "cwindow.inc"

+#include "cwindowgui.inc"

 #include "cwindowtool.inc"
 #include "editpanel.h"
 #include "floatauto.inc"
 #include "cwindowtool.inc"
 #include "editpanel.h"
 #include "floatauto.inc"


@@ -42,15 +43,6 @@
 #include "track.inc"
 #include "zoompanel.h"
 
 #include "track.inc"
 #include "zoompanel.h"
 

-class CWindowZoom;
-class CWindowSlider;
-class CWindowReset;
-class CWindowDestination;
-class CWindowMeters;
-class CWindowTransport;
-class CWindowCanvas;
-class CWindowEditing;
-

 
 #define AUTO_ZOOM N_("Auto")
 
 
 #define AUTO_ZOOM N_("Auto")
 


@@ -249,16 +241,6 @@ public:
        MWindow *mwindow;
 };
 
        MWindow *mwindow;
 };
 

-// class CWindowDestination : public BC_PopupTextBox
-// {
-// public:
-//     CWindowDestination(MWindow *mwindow, CWindowGUI *cwindow, int x, int y);
-//     ~CWindowDestination();
-//     int handle_event();
-//     CWindowGUI *cwindow;
-//     MWindow *mwindow;
-// };
-

 class CWindowTransport : public PlayTransport
 {
 public:
 class CWindowTransport : public PlayTransport
 {
 public:


@@ -272,12 +254,21 @@ public:
        CWindowGUI *gui;
 };
 
        CWindowGUI *gui;
 };
 

+class CWindowCanvasToggleControls : public BC_MenuItem
+{
+public:
+       CWindowCanvasToggleControls(CWindowCanvas *canvas);
+       int handle_event();
+       static const char *calculate_text(int cwindow_controls);
+       CWindowCanvas *canvas;
+};

 
 class CWindowCanvas : public Canvas
 {
 public:
        CWindowCanvas(MWindow *mwindow, CWindowGUI *gui);
 
 
 class CWindowCanvas : public Canvas
 {
 public:
        CWindowCanvas(MWindow *mwindow, CWindowGUI *gui);
 

+       void create_objects(EDL *edl);

        void status_event();
        void zoom_resize_window(float percentage);
        void update_zoom(int x, int y, float zoom);
        void status_event();
        void zoom_resize_window(float percentage);
        void update_zoom(int x, int y, float zoom);


@@ -287,11 +278,8 @@ public:
        void zoom_auto();
        int do_scroll(EDL *edl, float cursor_x, float cursor_y);
        int do_eyedrop(int &rerender, int button_press, int draw);
        void zoom_auto();
        int do_scroll(EDL *edl, float cursor_x, float cursor_y);
        int do_eyedrop(int &rerender, int button_press, int draw);

-       int do_mask(int &redraw,
-               int &rerender,
-               int button_press,
-               int cursor_motion,
-               int draw);
+       int do_mask(int &redraw, int &rerender,
+               int button_press, int cursor_motion, int draw);

        int do_mask_focus();
        void draw_refresh(int flash = 1);
        int need_overlays();
        int do_mask_focus();
        void draw_refresh(int flash = 1);
        int need_overlays();


@@ -305,10 +293,7 @@ public:
        int button_release_event();
        int test_crop(int button_press, int &redraw);
        int test_bezier(int button_press,
        int button_release_event();
        int test_crop(int button_press, int &redraw);
        int test_bezier(int button_press,

-               int &redraw,
-               int &redraw_canvas,
-               int &rerender,
-               int do_camera);
+               int &redraw, int &redraw_canvas, int &rerender, int do_camera);

        int do_ruler(int draw, int motion, int button_press, int button_release);
        int test_zoom(int &redraw);
        void create_keyframe(int do_camera);
        int do_ruler(int draw, int motion, int button_press, int button_release);
        int test_zoom(int &redraw);
        void create_keyframe(int do_camera);


@@ -324,12 +309,13 @@ public:
        void draw_outlines(int do_camera);
        void draw_crop();
        void calculate_origin();
        void draw_outlines(int do_camera);
        void draw_crop();
        void calculate_origin();

-       void toggle_controls();
-       int get_cwindow_controls();

        int get_clear_color();
        int get_clear_color();

+       int get_controls();
+       void toggle_controls();

 
        MWindow *mwindow;
        CWindowGUI *gui;
 
        MWindow *mwindow;
        CWindowGUI *gui;

+       CWindowCanvasToggleControls *controls;

        float last_xscroll, last_yscroll;
        float last_zoom;
 };
        float last_xscroll, last_yscroll;
        float last_zoom;
 };

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.inc b/cinelerra-5.1/cinelerra/cwindowgui.inc
index dfd864ccb27cd9adadc2f172d10d06b5ef733401..dd482144b4f15394eecfa43b1df456aff40d4c8a 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.inc
+++ b/cinelerra-5.1/cinelerra/cwindowgui.inc
@@ -22,7 +22,14 @@
 #ifndef CWINDOWGUI_INC
 #define CWINDOWGUI_INC
 
 #ifndef CWINDOWGUI_INC
 #define CWINDOWGUI_INC
 

-

 class CWindowGUI;
 class CWindowGUI;

+class CWindowEditing;
+class CWindowMeters;
+class CWindowZoom;
+class CWindowSlider;
+class CWindowReset;
+class CWindowTransport;
+class CWindowCanvasToggleControls;
+class CWindowCanvas;

 
 #endif
 
 #endif

diff --git a/cinelerra-5.1/cinelerra/recordgui.inc b/cinelerra-5.1/cinelerra/recordgui.inc
index d74fb4cc256fa930945bd5b30eafeef027320275..e8a8774235f49852569e82f8d88e0ac4a32c1f53 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordgui.inc
+++ b/cinelerra-5.1/cinelerra/recordgui.inc
@@ -22,8 +22,46 @@
 #ifndef RECORDGUI_INC
 #define RECORDGUI_INC
 
 #ifndef RECORDGUI_INC
 #define RECORDGUI_INC
 

+class RecordGUIBatches;

 class RecordGUI;
 class RecordGUI;

+class RecordGUISave;
+class RecordGUICancel;
+class RecordGUIOK;
+class RecordGUIStartBatches;
+class RecordGUIStopBatches;
+class RecordGUIActivateBatch;
+class RecordGUIStartOver;
+class EndRecordThread;
+class RecordStartoverThread;
+class RecordBatch;
+class RecordPath;
+class RecordStart;
+class RecordDuration;
+class RecordSource;
+class RecordNews;
+class RecordGUIDropFrames;
+class RecordGUIFillFrames;
+class RecordGUIPowerOff;
+class RecordGUICommCheck;
+class RecordGUIDelaceItem;
+class RecordGUIDeinterlace;
+class RecordGUIMonitorVideo;
+class RecordGUIMonitorAudio;
+class RecordGUIAudioMeters;
+class RecordGUINewBatch;
+class RecordGUIDeleteBatch;
+class RecordGUILabel;
+class RecordGUIClearLabels;
+class RecordStatusThread;
+class RecordGUIFlash;
+class RecordGUIModeMenu;
+class RecordGUIModeTextBox;
+class RecordGUIModeListBox;
+class RecordGUIModeMenu;
+class RecordGUIDCOffset;

 class RecordGUIDCOffsetText;
 class RecordGUIDCOffsetText;

+class RecordGUIReset;
+class RecordGUIResetTranslation;

 class RecordMonitor;
 
 #endif
 class RecordMonitor;
 
 #endif

diff --git a/cinelerra-5.1/cinelerra/recordmonitor.C b/cinelerra-5.1/cinelerra/recordmonitor.C
index 9c4bf5eeff52c64ca51823eea7e6cae546ee9220..3a77feb65d4798fbaf2df0de7d1959728d7a1232 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordmonitor.C
+++ b/cinelerra-5.1/cinelerra/recordmonitor.C
@@ -354,7 +354,6 @@ void RecordMonitorGUI::create_objects()
                        mwindow->theme->rmonitor_canvas_w,
                        mwindow->theme->rmonitor_canvas_h);
                canvas->create_objects(0);
                        mwindow->theme->rmonitor_canvas_w,
                        mwindow->theme->rmonitor_canvas_h);
                canvas->create_objects(0);

-               canvas->use_rwindow();

 
 #ifdef HAVE_DVB
                if( driver == CAPTURE_DVB ) {
 
 #ifdef HAVE_DVB
                if( driver == CAPTURE_DVB ) {


@@ -780,6 +779,12 @@ RecordMonitorCanvas::~RecordMonitorCanvas()
 {
 }
 
 {
 }
 

+void RecordMonitorCanvas::create_objects(EDL *edl)
+{
+       Canvas::create_objects(edl);
+       canvas_menu->add_item(new CanvasPopupResetTranslation(this));
+}
+

 int RecordMonitorCanvas::get_output_w()
 {
        return record->default_asset->width;
 int RecordMonitorCanvas::get_output_w()
 {
        return record->default_asset->width;

diff --git a/cinelerra-5.1/cinelerra/recordmonitor.h b/cinelerra-5.1/cinelerra/recordmonitor.h
index 987d325b35ece68ca10fd1b4c3244f11f429bd08..a186c16e3d47bcec99cd25702ae42ff2d3f11826 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordmonitor.h
+++ b/cinelerra-5.1/cinelerra/recordmonitor.h
@@ -221,6 +221,7 @@ public:
                Record *record, int x, int y, int w, int h);
        ~RecordMonitorCanvas();
 
                Record *record, int x, int y, int w, int h);
        ~RecordMonitorCanvas();
 

+       void create_objects(EDL *edl);

        void zoom_resize_window(float percentage);
        int button_press_event();
        int button_release_event();
        void zoom_resize_window(float percentage);
        int button_press_event();
        int button_release_event();

diff --git a/cinelerra-5.1/cinelerra/scale.C b/cinelerra-5.1/cinelerra/scale.C
index 8c7b49c9a2a68e6564782894f7e3823baf40a1a3..860c46fb0e010014805e41ed5bccb86eb2c9b3fe 100644 (file)
--- a/cinelerra-5.1/cinelerra/scale.C
+++ b/cinelerra-5.1/cinelerra/scale.C
@@ -64,7 +64,7 @@ void ScaleThread::run()
        already_running = 1;
        constrain_ratio = mwindow->defaults->get("SCALECONSTRAIN", 0);
        scale_data = mwindow->defaults->get("SCALEDATA", 0);
        already_running = 1;
        constrain_ratio = mwindow->defaults->get("SCALECONSTRAIN", 0);
        scale_data = mwindow->defaults->get("SCALEDATA", 0);

-       auto_aspect = mwindow->defaults->get("AUDIOASPECT", 0);
+       auto_aspect = mwindow->defaults->get("AUTOASPECT", 0);

        offsets[0] = offsets[1] = offsets[2] = offsets[3] = 0;
 
        orig_dimension[0] = dimension[0] = mwindow->session->track_w;
        offsets[0] = offsets[1] = offsets[2] = offsets[3] = 0;
 
        orig_dimension[0] = dimension[0] = mwindow->session->track_w;

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 1fb4ca21d64bafb76ed674f1d15659274ee7dbdc..eb42c679f72f339c3bdcf60730eda2c5140c6849 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -237,7 +237,6 @@ void VWindowGUI::create_objects()
 
        canvas = new VWindowCanvas(mwindow, this);
        canvas->create_objects(mwindow->edl);
 
        canvas = new VWindowCanvas(mwindow, this);
        canvas->create_objects(mwindow->edl);

-       canvas->use_vwindow();

        char vsplash_path[BCTEXTLEN];
        int vsplash_len = sizeof(vsplash_path)-1;
        snprintf(vsplash_path, vsplash_len, "%s/vsplash.png", File::get_cindat_path());
        char vsplash_path[BCTEXTLEN];
        int vsplash_len = sizeof(vsplash_path)-1;
        snprintf(vsplash_path, vsplash_len, "%s/vsplash.png", File::get_cindat_path());


@@ -774,6 +773,12 @@ VWindowCanvas::VWindowCanvas(MWindow *mwindow, VWindowGUI *gui)
        this->gui = gui;
 }
 
        this->gui = gui;
 }
 

+void VWindowCanvas::create_objects(EDL *edl)
+{
+       Canvas::create_objects(edl);
+       canvas_menu->add_item(new CanvasPopupRemoveSource(this));
+}
+

 void VWindowCanvas::zoom_resize_window(float percentage)
 {
        EDL *edl = gui->vwindow->get_edl();
 void VWindowCanvas::zoom_resize_window(float percentage)
 {
        EDL *edl = gui->vwindow->get_edl();

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.h b/cinelerra-5.1/cinelerra/vwindowgui.h
index 712565dde9ef5221e2c9e14f3e8c89c9c3dfa2dd..6836293fcd3e6f49648d9de404a549b49222e34e 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.h
+++ b/cinelerra-5.1/cinelerra/vwindowgui.h
@@ -30,22 +30,12 @@
 #include "meterpanel.h"
 #include "mwindow.inc"
 #include "playtransport.h"
 #include "meterpanel.h"
 #include "mwindow.inc"
 #include "playtransport.h"

-

 #include "timebar.h"
 #include "timebar.h"

-

 #include "vtimebar.inc"
 #include "vwindow.inc"
 #include "vtimebar.inc"
 #include "vwindow.inc"

+#include "vwindowgui.inc"

 #include "zoompanel.h"
 
 #include "zoompanel.h"
 

-class VWindowZoom;
-class VWindowSource;
-class VWindowTransport;
-class VWindowEditing;
-class VWindowCanvas;
-class VWindowMeters;
-class VWindowInPoint;
-class VWindowOutPoint;
-

 class VWindowGUI : public BC_Window
 {
 public:
 class VWindowGUI : public BC_Window
 {
 public:


@@ -110,11 +100,19 @@ public:
 };
 
 
 };
 
 

+class VWindowCanvasPopupRemoveSource : public BC_MenuItem
+{
+public:
+       VWindowCanvasPopupRemoveSource(Canvas *canvas);
+       int handle_event();
+       Canvas *canvas;
+};
+

 class VWindowCanvas : public Canvas
 {
 public:
        VWindowCanvas(MWindow *mwindow, VWindowGUI *gui);
 class VWindowCanvas : public Canvas
 {
 public:
        VWindowCanvas(MWindow *mwindow, VWindowGUI *gui);

-
+       void create_objects(EDL *edl);

        void zoom_resize_window(float percentage);
        void draw_refresh(int flush = 1);
        int need_overlays();
        void zoom_resize_window(float percentage);
        void draw_refresh(int flush = 1);
        int need_overlays();

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.inc b/cinelerra-5.1/cinelerra/vwindowgui.inc
index 24a51a06a949556d242e95e958b96428c3e5e1a2..a679fd54a25acd5068fd6762cf5d62456a9db5a5 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.inc
+++ b/cinelerra-5.1/cinelerra/vwindowgui.inc
@@ -23,5 +23,14 @@
 #define VWINDOWGUI_INC
 
 class VWindowGUI;
 #define VWINDOWGUI_INC
 
 class VWindowGUI;

+class VWindowMeters;
+class VWindowCanvasPopupRemoveSource;
+class VWindowCanvas;
+class VWindowEditing;
+class VWindowZoom;
+class VWindowSource;
+class VWindowTransport;
+class VWindowInPoint;
+class VWindowOutPoint;

 
 #endif
 
 #endif

diff --git a/cinelerra-5.1/cinelerra/zwindow.C b/cinelerra-5.1/cinelerra/zwindow.C
index 786ecc5449e1342f2f7fdcf5d4282fd3fbfc1d15..62a98cc048441662d79bfcf0bd56a75a28eae5d6 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindow.C
+++ b/cinelerra-5.1/cinelerra/zwindow.C
@@ -188,6 +188,7 @@ ZWindow::ZWindow(MWindow *mwindow)
        highlighted = 0;
        title[0] = 0;
        zgui = 0;
        highlighted = 0;
        title[0] = 0;
        zgui = 0;

+       zoom = 0;

 }
 
 ZWindow::~ZWindow()
 }
 
 ZWindow::~ZWindow()

diff --git a/cinelerra-5.1/cinelerra/zwindow.h b/cinelerra-5.1/cinelerra/zwindow.h
index 1c6f4ce077b65be5a4720ba96ab78288986028ba..5af5ccd86d90a356eddbc7900cd23652e7aeae47 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindow.h
+++ b/cinelerra-5.1/cinelerra/zwindow.h
@@ -84,6 +84,7 @@ public:
        int idx;
        int highlighted;
        char title[BCTEXTLEN];
        int idx;
        int highlighted;
        char title[BCTEXTLEN];

+       float zoom;

 };
 
 #endif
 };
 
 #endif

diff --git a/cinelerra-5.1/cinelerra/zwindowgui.C b/cinelerra-5.1/cinelerra/zwindowgui.C
index 90cd349a536fe5c8a78e5aa920e5c7a1516ed46a..6f1f8132848bfc62b8115c46640c30c445230a8c 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindowgui.C
+++ b/cinelerra-5.1/cinelerra/zwindowgui.C
@@ -194,6 +194,18 @@ int ZWindowGUI::draw_overlays()
        return 1;
 }
 
        return 1;
 }
 

+
+ZWindowCanvasTileMixers::ZWindowCanvasTileMixers(ZWindowCanvas *canvas)
+ : BC_MenuItem(_("Tile Mixers"))
+{
+       this->canvas = canvas;
+}
+int ZWindowCanvasTileMixers::handle_event()
+{
+       canvas->mwindow->tile_mixers();
+       return 1;
+}
+

 ZWindowCanvas::ZWindowCanvas(MWindow *mwindow, ZWindowGUI *gui,
                int x, int y, int w, int h)
  : Canvas(mwindow, gui, x,y, w,h, 0,0,0)
 ZWindowCanvas::ZWindowCanvas(MWindow *mwindow, ZWindowGUI *gui,
                int x, int y, int w, int h)
  : Canvas(mwindow, gui, x,y, w,h, 0,0,0)


@@ -202,6 +214,12 @@ ZWindowCanvas::ZWindowCanvas(MWindow *mwindow, ZWindowGUI *gui,
        this->gui = gui;
 }
 
        this->gui = gui;
 }
 

+void ZWindowCanvas::create_objects(EDL *edl)
+{
+       Canvas::create_objects(edl);
+       canvas_menu->add_item(new ZWindowCanvasTileMixers(this));
+}
+

 void ZWindowCanvas::close_source()
 {
        gui->unlock_window();
 void ZWindowCanvas::close_source()
 {
        gui->unlock_window();


@@ -214,7 +232,6 @@ void ZWindowCanvas::close_source()
        }
 }
 
        }
 }
 

-

 void ZWindowCanvas::draw_refresh(int flush)
 {
        EDL *edl = gui->zwindow->edl;
 void ZWindowCanvas::draw_refresh(int flush)
 {
        EDL *edl = gui->zwindow->edl;


@@ -259,3 +276,33 @@ float ZWindowCanvas::get_auto_zoom()
        return zoom_x < zoom_y ? zoom_x : zoom_y;
 }
 
        return zoom_x < zoom_y ? zoom_x : zoom_y;
 }
 

+float ZWindowCanvas::get_zoom()
+{
+        return gui->zwindow->zoom;
+}
+void ZWindowCanvas::update_zoom(int x, int y, float zoom)
+{
+        gui->zwindow->zoom = zoom;
+}
+
+void ZWindowCanvas::zoom_auto()
+{
+       EDL *edl = gui->zwindow->edl;
+       if( !edl ) edl = mwindow->edl;
+        set_zoom(edl, 0);
+}
+
+void ZWindowCanvas::zoom_resize_window(float zoom)
+{
+       if( !zoom ) zoom = get_auto_zoom();
+       EDL *edl = gui->zwindow->edl;
+       if( !edl ) edl = mwindow->edl;
+       int ow = edl->session->output_w, oh = edl->session->output_h;
+       int canvas_w, canvas_h;
+       calculate_sizes(mwindow->edl->get_aspect_ratio(), ow, oh,
+               zoom, canvas_w, canvas_h);
+       int new_w = canvas_w + xS(20);
+       int new_h = canvas_h + yS(20);
+       gui->resize_window(new_w, new_h);
+       gui->resize_event(new_w, new_h);
+}

diff --git a/cinelerra-5.1/cinelerra/zwindowgui.h b/cinelerra-5.1/cinelerra/zwindowgui.h
index 32bfd0358af24e3817e3b5c0c05ca9982af30717..5d9d292b6d589e4ae1f982ab850cb0093e2014d6 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindowgui.h
+++ b/cinelerra-5.1/cinelerra/zwindowgui.h
@@ -59,15 +59,28 @@ public:
        int highlighted;
 };
 
        int highlighted;
 };
 

+class ZWindowCanvasTileMixers : public BC_MenuItem
+{
+public:
+       ZWindowCanvasTileMixers(ZWindowCanvas *canvas);
+       int handle_event();
+       ZWindowCanvas *canvas;
+};
+

 class ZWindowCanvas : public Canvas
 {
 public:
        ZWindowCanvas(MWindow *mwindow, ZWindowGUI *gui,
                int x, int y, int w, int h);
 
 class ZWindowCanvas : public Canvas
 {
 public:
        ZWindowCanvas(MWindow *mwindow, ZWindowGUI *gui,
                int x, int y, int w, int h);
 

+       void create_objects(EDL *edl);

        void close_source();
        void draw_refresh(int flush = 1);
        float get_auto_zoom();
        void close_source();
        void draw_refresh(int flush = 1);
        float get_auto_zoom();

+       float get_zoom();
+       void update_zoom(int x, int y, float zoom);
+       void zoom_auto();
+       void zoom_resize_window(float percentage);

 
        MWindow *mwindow;
        ZWindowGUI *gui;
 
        MWindow *mwindow;
        ZWindowGUI *gui;

diff --git a/cinelerra-5.1/cinelerra/zwindowgui.inc b/cinelerra-5.1/cinelerra/zwindowgui.inc
index 1fcb5d0c22e10d6a5786f6d82109e7e9d2c4173d..815605fd019e62999cab4bdc0f8e02f2b2820d5b 100644 (file)
--- a/cinelerra-5.1/cinelerra/zwindowgui.inc
+++ b/cinelerra-5.1/cinelerra/zwindowgui.inc
@@ -23,5 +23,7 @@
 #define __ZWINDOWGUI_INC__
 
 class ZWindowGUI;
 #define __ZWINDOWGUI_INC__
 
 class ZWindowGUI;

+class ZWindowCanvasTileMixers;
+class ZWindowCanvas;

 
 #endif
 
 #endif

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index ee75006c35636d9c94d798ea82af8239a628a27e..f10af67ef952e0a04e9841421957b4262e125f43 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -415,7 +415,7 @@ PKG_3RD([libaom],[auto],
   [ usr/local/include ])
 
 PKG_3RD([dav1d],[auto],
   [ usr/local/include ])
 
 PKG_3RD([dav1d],[auto],

-  [dav1d-0.5.1],
+  [dav1d-0.6.0],

   [ usr/local/lib*/libdav1d*.a ],
   [ usr/local/include ])
 
   [ usr/local/lib*/libdav1d*.a ],
   [ usr/local/include ])
 

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index c52196f65b3e2fdba460439f129fee0ee2542b7e..e64b2eb04b15fbed85aa667d67aaec122acb650c 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -1022,8 +1022,8 @@ if( debug && event->type != ClientMessage ) {
 
 //printf("BC_WindowBase::dispatch_event %d %d\n", __LINE__, button_number);
                event_win = event->xany.window;
 
 //printf("BC_WindowBase::dispatch_event %d %d\n", __LINE__, button_number);
                event_win = event->xany.window;

-               if (button_number < 6) {
-                       if(button_number < 4)
+               if( button_number < 6 ) {
+                       if( button_number < 4 )

                                button_down = 1;
                        button_pressed = event->xbutton.button;
                        button_time1 = button_time2;
                                button_down = 1;
                        button_pressed = event->xbutton.button;
                        button_time1 = button_time2;


@@ -1036,23 +1036,20 @@ if( debug && event->type != ClientMessage ) {
                        drag_x2 = cursor_x + get_resources()->drag_radius;
                        drag_y1 = cursor_y - get_resources()->drag_radius;
                        drag_y2 = cursor_y + get_resources()->drag_radius;
                        drag_x2 = cursor_x + get_resources()->drag_radius;
                        drag_y1 = cursor_y - get_resources()->drag_radius;
                        drag_y2 = cursor_y + get_resources()->drag_radius;

-
-                       if((long)(button_time3 - button_time1) < resources->double_click * 2)
-                       {
-                               triple_click = 1;
-                               button_time3 = button_time2 = button_time1 = 0;
-                       }
-                       if((long)(button_time3 - button_time2) < resources->double_click)
-                       {
-                               double_click = 1;
-//                             button_time3 = button_time2 = button_time1 = 0;
-                       }
-                       else
-                       {
-                               triple_click = 0;
-                               double_click = 0;
+                       if( button_number < 4 ) {
+                               if((long)(button_time3 - button_time1) < resources->double_click * 2) {
+                                       triple_click = 1;
+                                       button_time3 = button_time2 = button_time1 = 0;
+                               }
+                               if((long)(button_time3 - button_time2) < resources->double_click) {
+                                       double_click = 1;
+//                                     button_time3 = button_time2 = button_time1 = 0;
+                               }
+                               else {
+                                       triple_click = 0;
+                                       double_click = 0;
+                               }

                        }
                        }

-

                        dispatch_button_press();
                }
                break;
                        dispatch_button_press();
                }
                break;

diff --git a/cinelerra-5.1/plugins/shapewipe/shapewipe.C b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
index ca675e2d14fc2107d561e8877f6d581073b39fe8..b11006d078d48b1371eca3bbe598b597e3d862ee 100644 (file)
--- a/cinelerra-5.1/plugins/shapewipe/shapewipe.C
+++ b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
@@ -565,20 +565,40 @@ void ShapeWipeMain::reset_pattern_image()
        float scale = feather ? 1/feather : 0xff; \
        type  **in_rows = (type**)input->get_rows(); \
        type **out_rows = (type**)output->get_rows(); \
        float scale = feather ? 1/feather : 0xff; \
        type  **in_rows = (type**)input->get_rows(); \
        type **out_rows = (type**)output->get_rows(); \

-       for( int y=y1; y<y2; ++y ) { \
-               type *in_row = (type*) in_rows[y]; \
-               type *out_row = (type*)out_rows[y]; \
-               unsigned char *pattern_row = pattern_image[y]; \
-               for( int x=0; x<w; ++x ) { \
-                       tmp_type d = (pattern_row[x] - threshold) * scale; \
-                       if( d > 0xff ) d = 0xff; \
-                       else if( d < -0xff ) d = -0xff; \
-                       tmp_type a = (d + 0xff) / 2, b = 0xff - a; \
-                       for( int i=0; i<components; ++i ) { \
-                               type ic = in_row[i], oc = out_row[i]; \
-                               out_row[i] = (ic * a + oc * b) / 0xff; \
+       if( !dir ) { \
+               for( int y=y1; y<y2; ++y ) { \
+                       type *in_row = (type*) in_rows[y]; \
+                       type *out_row = (type*)out_rows[y]; \
+                       unsigned char *pattern_row = pattern_image[y]; \
+                       for( int x=0; x<w; ++x ) { \
+                               tmp_type d = (pattern_row[x] - threshold) * scale; \
+                               if( d > 0xff ) d = 0xff; \
+                               else if( d < -0xff ) d = -0xff; \
+                               tmp_type a = (d + 0xff) / 2, b = 0xff - a; \
+                               for( int i=0; i<components; ++i ) { \
+                                       type ic = in_row[i], oc = out_row[i]; \
+                                       out_row[i] = (ic * a + oc * b) / 0xff; \
+                               } \
+                               in_row += components; out_row += components; \
+                       } \
+               } \
+       } \
+       else { \
+               for( int y=y1; y<y2; ++y ) { \
+                       type *in_row = (type*) in_rows[y]; \
+                       type *out_row = (type*)out_rows[y]; \
+                       unsigned char *pattern_row = pattern_image[y]; \
+                       for( int x=0; x<w; ++x ) { \
+                               tmp_type d = (pattern_row[x] - threshold) * scale; \
+                               if( d > 0xff ) d = 0xff; \
+                               else if( d < -0xff ) d = -0xff; \
+                               tmp_type b = (d + 0xff) / 2, a = 0xff - b; \
+                               for( int i=0; i<components; ++i ) { \
+                                       type ic = in_row[i], oc = out_row[i]; \
+                                       out_row[i] = (ic * a + oc * b) / 0xff; \
+                               } \
+                               in_row += components; out_row += components; \

                        } \
                        } \

-                       in_row += components; out_row += components; \

                } \
        } \
 }
                } \
        } \
 }


@@ -646,6 +666,7 @@ void ShapeUnit::process_package(LoadPackage *package)
        VFrame *input = server->plugin->input;
        VFrame *output = server->plugin->output;
        int w = input->get_w();
        VFrame *input = server->plugin->input;
        VFrame *output = server->plugin->output;
        int w = input->get_w();

+       int dir = server->plugin->config.direction;

 
        unsigned char **pattern_image = server->plugin->pattern_image;
        unsigned char threshold = server->plugin->threshold;
 
        unsigned char **pattern_image = server->plugin->pattern_image;
        unsigned char threshold = server->plugin->threshold;

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index b56e8a77475c9a9a417ab87d620ab72787214830..2c54c32e8c16adf9605c6aedf6bfd06d8d072c32 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -33,7 +33,7 @@ ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20191217-2245-stable.tar
 https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz
 https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
 https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz

-https://code.videolan.org/videolan/dav1d/-/archive/0.5.0/dav1d-0.5.0.tar.gz
+https://code.videolan.org/videolan/dav1d/-/archive/0.6.0/dav1d-0.6.0.tar.gz

 https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk
 https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 https://github.com/webmproject/libwebp = libwebp-1.1.0
 https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk
 https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 https://github.com/webmproject/libwebp = libwebp-1.1.0

diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz b/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz
deleted file mode 100644 (file)
index 805f750..0000000
Binary files a/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1 b/cinelerra-5.1/thirdparty/src/dav1d-0.6.0.patch1
similarity index 93%
rename from cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
rename to cinelerra-5.1/thirdparty/src/dav1d-0.6.0.patch1
index d4f2b8356971afc979633a0cd8b1b2f33c9000fc..ebfb9ca65f477e3776cbd20fc8b52d8967f243b2 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
+++ b/cinelerra-5.1/thirdparty/src/dav1d-0.6.0.patch1
@@ -1,7 +1,7 @@
-diff -urN a/Makefile b/Makefile
+diff -ruN a/Makefile b/Makefile

 --- a/Makefile 1969-12-31 17:00:00.000000000 -0700
 --- a/Makefile 1969-12-31 17:00:00.000000000 -0700

-+++ b/Makefile 2019-10-14 10:54:47.354841430 -0600
-@@ -0,0 +1,363 @@
++++ b/Makefile 2020-03-12 17:08:48.095517451 -0600
+@@ -0,0 +1,368 @@

 +
 +_ARCH := $(shell uname -m)
 +ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
 +
 +_ARCH := $(shell uname -m)
 +ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')


@@ -36,7 +36,7 @@ diff -urN a/Makefile b/Makefile
 +
 +STATIC_LIB=$(BUILD)/src/libdav1d.a
 +SHARED_LIB=$(BUILD)/src/libdav1d.so
 +
 +STATIC_LIB=$(BUILD)/src/libdav1d.a
 +SHARED_LIB=$(BUILD)/src/libdav1d.so

-+DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L
++DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

 +FUZZ= -DDAV1D_MT_FUZZING
 +
 +BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
 +FUZZ= -DDAV1D_MT_FUZZING
 +
 +BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \


@@ -78,7 +78,7 @@ diff -urN a/Makefile b/Makefile
 +      -fomit-frame-pointer \
 +      -ffast-math \
 +      -fPIC \
 +      -fomit-frame-pointer \
 +      -ffast-math \
 +      -fPIC \

-+      -mpreferred-stack-boundary=5 \
++      -mpreferred-stack-boundary=6 \

 +      -MD -MQ $@ -MF $@.d \
 +
 +SHA_OPTS=\
 +      -MD -MQ $@ -MF $@.d \
 +
 +SHA_OPTS=\


@@ -88,7 +88,7 @@ diff -urN a/Makefile b/Makefile
 +      -shared \
 +      -fPIC \
 +      -Wl,--start-group \
 +      -shared \
 +      -fPIC \
 +      -Wl,--start-group \

-+      -Wl,-soname,libdav1d.so.2 \
++      -Wl,-soname,libdav1d.so.4 \

 +      -Wl,--end-group \
 +      -pthread \
 +
 +      -Wl,--end-group \
 +      -pthread \
 +


@@ -98,21 +98,22 @@ diff -urN a/Makefile b/Makefile
 +
 +# nasm
 +NASM_OBJS=$(call any,$(NASM_BLD), \
 +
 +# nasm
 +NASM_OBJS=$(call any,$(NASM_BLD), \

++      cpuid.obj \
++      msac.obj \

 +      cdef.obj \
 +      film_grain.obj \
 +      ipred.obj \
 +      itx.obj \
 +      cdef.obj \
 +      film_grain.obj \
 +      ipred.obj \
 +      itx.obj \

-+      cdef_sse.obj \
-+      ipred_ssse3.obj \

 +      loopfilter.obj \
 +      looprestoration.obj \
 +      mc.obj \
 +      loopfilter.obj \
 +      looprestoration.obj \
 +      mc.obj \

++      cdef_sse.obj \
++      film_grain_ssse3.obj \
++      ipred_ssse3.obj \

 +      itx_ssse3.obj \
 +      itx_ssse3.obj \

-+      looprestoration_ssse3.obj \

 +      loopfilter_ssse3.obj \
 +      loopfilter_ssse3.obj \

-+      mc_ssse3.obj \
-+      cpuid.obj \
-+      msac.obj )
++      looprestoration_ssse3.obj \
++      mc_ssse3.obj)

 +
 +$(NASM_BLD)/%.obj: src/x86/%.asm
 +      $(NASM) -f $(ASM_ARCH) \
 +
 +$(NASM_BLD)/%.obj: src/x86/%.asm
 +      $(NASM) -f $(ASM_ARCH) \


@@ -136,6 +137,7 @@ diff -urN a/Makefile b/Makefile
 +      dequant_tables.o \
 +      getbits.o \
 +      intra_edge.o \
 +      dequant_tables.o \
 +      getbits.o \
 +      intra_edge.o \

++      itx_1d.o \

 +      lf_mask.o \
 +      log.o \
 +      msac.o \
 +      lf_mask.o \
 +      log.o \
 +      msac.o \


@@ -148,7 +150,8 @@ diff -urN a/Makefile b/Makefile
 +      tables.o \
 +      warpmv.o \
 +      wedge.o \
 +      tables.o \
 +      warpmv.o \
 +      wedge.o \

-+      x86/cpu.c.o)
++      x86/cpu.c.o \
++      x86/msac_init.c.o)

 +$(SRC_BLD)/%.o: src/%.c
 +      $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
 +$(SRC_BLD)/x86/%.c.o: src/x86/%.c
 +$(SRC_BLD)/%.o: src/%.c
 +      $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
 +$(SRC_BLD)/x86/%.c.o: src/x86/%.c


@@ -204,17 +207,17 @@ diff -urN a/Makefile b/Makefile
 +      echo >> $@ "#define HAVE_ASM 1"
 +      echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
 +      echo >> $@ "#define HAVE_UNISTD_H 1"
 +      echo >> $@ "#define HAVE_ASM 1"
 +      echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
 +      echo >> $@ "#define HAVE_UNISTD_H 1"

-+      echo >> $@ "#define STACK_ALIGNMENT 32"
++      echo >> $@ "#define STACK_ALIGNMENT 64"

 +
 +$(BUILD)/config.asm:
 +      echo  > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
 +      echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
 +      echo >> $@ "%define PIC 1"
 +
 +$(BUILD)/config.asm:
 +      echo  > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
 +      echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
 +      echo >> $@ "%define PIC 1"

-+      echo >> $@ "%define STACK_ALIGNMENT 32"
++      echo >> $@ "%define STACK_ALIGNMENT 64"

 +
 +$(BUILD)/include/vcs_version.h:
 +      mkdir -p $(BUILD)/include
 +
 +$(BUILD)/include/vcs_version.h:
 +      mkdir -p $(BUILD)/include

-+      echo  > $@ "#define DAV1D_VERSION \"0.5.0\""
++      echo  > $@ "#define DAV1D_VERSION \"0.6.0\""

 +
 +$(BUILD)/include/dav1d/version.h:
 +      mkdir -p $(BUILD)/include/dav1d
 +
 +$(BUILD)/include/dav1d/version.h:
 +      mkdir -p $(BUILD)/include/dav1d


@@ -262,6 +265,7 @@ diff -urN a/Makefile b/Makefile
 +      input/annexb.o \
 +      input/ivf.o \
 +      input/input.o \
 +      input/annexb.o \
 +      input/ivf.o \
 +      input/input.o \

++      input/section5.o \

 +      output/md5.o \
 +      output/null.o \
 +      output/output.o \
 +      output/md5.o \
 +      output/null.o \
 +      output/output.o \


@@ -269,8 +273,9 @@ diff -urN a/Makefile b/Makefile
 +      output/yuv.o)
 +
 +DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\
 +      output/yuv.o)
 +
 +DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\

-+      dav1dplay.o \
++      ../examples/dav1dplay.o \

 +      input/annexb.o \
 +      input/annexb.o \

++      input/section5.o \

 +      input/ivf.o \
 +      input/input.o)
 +
 +      input/ivf.o \
 +      input/input.o)
 +


@@ -345,7 +350,7 @@ diff -urN a/Makefile b/Makefile
 +
 +$(OBJDIR):
 +      mkdir -p $@/include/dav1d \
 +
 +$(OBJDIR):
 +      mkdir -p $@/include/dav1d \

-+              $(BUILD)/src $(BUILD)/include \
++              $(BUILD)/src $(BUILD)/include $(BUILD)/examples \

 +              $(ENTRY_BLD) $(NASM_BLD) \
 +              $(SRC_BLD)/x86 $(BIT8_BLD)/x86 $(BIT16_BLD)/x86 \
 +              $(TOOLS_BLD) $(TOOLS_BLD)/input $(TOOLS_BLD)/output \
 +              $(ENTRY_BLD) $(NASM_BLD) \
 +              $(SRC_BLD)/x86 $(BIT8_BLD)/x86 $(BIT16_BLD)/x86 \
 +              $(TOOLS_BLD) $(TOOLS_BLD)/input $(TOOLS_BLD)/output \

diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.6.0.tar.xz b/cinelerra-5.1/thirdparty/src/dav1d-0.6.0.tar.xz
new file mode 100644 (file)
index 0000000..7eaa76b
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/dav1d-0.6.0.tar.xz differ