proxy asset refs fix, sams last ffmpeg icons

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index 90c02a738b157298ed6f6b224e6ab49bd441502e..ddc4d1c9d6fa678a0664525b8c9e57a91713b41e 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -177,13 +177,13 @@ void ProxyDialog::to_proxy()
                for( ; orig_asset; orig_asset=orig_asset->next ) {
                        char new_path[BCTEXTLEN];
                        proxy_render.to_proxy_path(new_path, orig_asset, proxy_scale);
-                       Asset *proxy_asset = edl->assets->get_asset(new_path);
-                       if( !proxy_asset ) continue;
 // test if proxy asset was already added to proxy_assets
                        int got_it = 0;
                        for( int i = 0; !got_it && i<proxy_assets.size(); ++i )
                                got_it = !strcmp(proxy_assets[i]->path, new_path);
                        if( got_it ) continue;
+                       Asset *proxy_asset = edl->assets->get_asset(new_path);
+                       if( !proxy_asset ) continue;
 // add pointer to existing EDL asset if it exists
 // EDL won't delete it unless it's the same pointer.
                        proxy_assets.append(proxy_asset);
@@ -197,8 +197,12 @@ void ProxyDialog::to_proxy()
                mwindow->set_proxy(0, 1, proxy_auto_scale, &proxy_assets, &orig_idxbls);
 
 // remove the references
-               for( int i=0; i<proxy_assets.size(); ++i )
-                       proxy_assets[i]->remove_user();
+               for( int i=0; i<proxy_assets.size(); ++i ) {
+                       Asset *proxy = (Asset *) proxy_assets[i];
+                       proxy->width = proxy->actual_width;
+                       proxy->height = proxy->actual_height;
+                       proxy->remove_user();
+               }
                proxy_assets.remove_all();
                for( int i = 0; i < orig_idxbls.size(); i++ )
                        orig_idxbls[i]->remove_user();
@@ -328,26 +332,31 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
        for( int i = 0; !got_it && i<orig_proxies.size(); ++i )
                got_it = !strcmp(orig_proxies[i]->path, new_path);
        if( got_it ) return 0;
-
-// new proxy asset
-       Asset *proxy = new Asset;
+       Assets *edl_assets = mwindow->edl->assets;
+       Asset *proxy = edl_assets->get_asset(new_path);
+       if( !proxy ) {
+               proxy = new Asset(new_path);
 // new compression parameters
-       proxy->copy_format(format_asset, 0);
-       proxy->update_path(new_path);
-       proxy->audio_data = 0;
-       proxy->video_data = 1;
-       proxy->layers = 1;
-       proxy->width = idxbl->get_w() / new_scale;
-       if( proxy->width & 1 ) ++proxy->width;
-       proxy->actual_width = proxy->width;
-       proxy->height = idxbl->get_h() / new_scale;
-       if( proxy->height & 1 ) ++proxy->height;
-       proxy->actual_height = proxy->height;
-       proxy->frame_rate = idxbl->get_frame_rate();
-       proxy->video_length = idxbl->get_video_frames();
+               proxy->copy_format(format_asset, 0);
+               proxy->audio_data = 0;
+               proxy->video_data = 1;
+               proxy->layers = 1;
+               proxy->width = idxbl->get_w() / new_scale;
+               if( proxy->width & 1 ) ++proxy->width;
+               proxy->actual_width = proxy->width;
+               proxy->height = idxbl->get_h() / new_scale;
+               if( proxy->height & 1 ) ++proxy->height;
+               proxy->actual_height = proxy->height;
+               proxy->frame_rate = idxbl->get_frame_rate();
+               proxy->video_length = idxbl->get_video_frames();
+               edl_assets->append(proxy);
+       }
+       else {
+               proxy->add_user();
+       }
        orig_proxies.append(proxy);
-       orig_idxbls.append(idxbl);
        idxbl->add_user();
+       orig_idxbls.append(idxbl);
        return proxy;
 }
 

diff --git a/cinelerra-5.1/picon_cinfinity/ff_swaprect.png b/cinelerra-5.1/picon_cinfinity/ff_swaprect.png
new file mode 100644 (file)
index 0000000..ed87401
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_swaprect.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_swapuv.png b/cinelerra-5.1/picon_cinfinity/ff_swapuv.png
new file mode 100644 (file)
index 0000000..cd6549d
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_swapuv.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_tinterlace.png b/cinelerra-5.1/picon_cinfinity/ff_tinterlace.png
new file mode 100644 (file)
index 0000000..4f54ef8
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_tinterlace.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_transpose.png b/cinelerra-5.1/picon_cinfinity/ff_transpose.png
new file mode 100644 (file)
index 0000000..c423ab8
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_transpose.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_uspp.png b/cinelerra-5.1/picon_cinfinity/ff_uspp.png
new file mode 100644 (file)
index 0000000..1d13779
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_uspp.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_vaguedenoiser.png b/cinelerra-5.1/picon_cinfinity/ff_vaguedenoiser.png
new file mode 100644 (file)
index 0000000..583e9c2
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_vaguedenoiser.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_vectorscope.png b/cinelerra-5.1/picon_cinfinity/ff_vectorscope.png
new file mode 100644 (file)
index 0000000..d7d264a
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_vectorscope.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_vflip.png b/cinelerra-5.1/picon_cinfinity/ff_vflip.png
new file mode 100644 (file)
index 0000000..7dd81ed
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_vflip.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_vignette.png b/cinelerra-5.1/picon_cinfinity/ff_vignette.png
new file mode 100644 (file)
index 0000000..44e2c5a
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_vignette.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_w3fdif.png b/cinelerra-5.1/picon_cinfinity/ff_w3fdif.png
new file mode 100644 (file)
index 0000000..85a8a79
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_w3fdif.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_waveform.png b/cinelerra-5.1/picon_cinfinity/ff_waveform.png
new file mode 100644 (file)
index 0000000..6f99a00
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_waveform.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_weave.png b/cinelerra-5.1/picon_cinfinity/ff_weave.png
new file mode 100644 (file)
index 0000000..f4b532d
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_weave.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_xbr.png b/cinelerra-5.1/picon_cinfinity/ff_xbr.png
new file mode 100644 (file)
index 0000000..029c54b
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_xbr.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_yadif.png b/cinelerra-5.1/picon_cinfinity/ff_yadif.png
new file mode 100644 (file)
index 0000000..9e8af1a
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_yadif.png differ

diff --git a/cinelerra-5.1/picon_cinfinity/ff_zoompan.png b/cinelerra-5.1/picon_cinfinity/ff_zoompan.png
new file mode 100644 (file)
index 0000000..8317edd
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_zoompan.png differ