X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=fab58403d7c54cfaefccc06232ffcf45d9f97589;hb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;hp=fd6e97e4436f738e172c4215ecf034655c52c885;hpb=86c9537e0540010ff43b16feb4cd7de98409eba1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index fd6e97e4..fab58403 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -133,6 +133,8 @@ int Asset::init_values() ac3_bitrate = 128; png_use_alpha = 0; + png_depth = 8; + png_compression = 0; exr_use_alpha = 0; exr_compression = 0; @@ -163,7 +165,9 @@ void Asset::reset_video() actual_width = width = 0; actual_height = height = 0; proxy_scale = 0; // not a proxy + proxy_edl = 0; // not proxy from edl video_length = 0; + timecode = -2; // unknown single_frame = 0; vmpeg_cmodel = BC_YUV420P; frame_rate = 0; @@ -214,6 +218,7 @@ void Asset::copy_format(Asset *asset, int do_index) use_header = asset->use_header; aspect_ratio = asset->aspect_ratio; interlace_mode = asset->interlace_mode; + timecode = asset->timecode; video_data = asset->video_data; layers = asset->layers; @@ -224,6 +229,7 @@ void Asset::copy_format(Asset *asset, int do_index) actual_width = asset->actual_width; actual_height = asset->actual_height; proxy_scale = asset->proxy_scale; + proxy_edl = asset->proxy_edl; strcpy(vcodec, asset->vcodec); strcpy(acodec, asset->acodec); @@ -279,13 +285,14 @@ void Asset::copy_format(Asset *asset, int do_index) ac3_bitrate = asset->ac3_bitrate; png_use_alpha = asset->png_use_alpha; + png_depth = asset->png_depth; + png_compression = asset->png_compression; exr_use_alpha = asset->exr_use_alpha; exr_compression = asset->exr_compression; tiff_cmodel = asset->tiff_cmodel; tiff_compression = asset->tiff_compression; - - + mov_sphere = asset->mov_sphere; jpeg_sphere = asset->jpeg_sphere; } @@ -373,7 +380,8 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) result = (layers == asset.layers && program == asset.program && frame_rate == asset.frame_rate && - asset.interlace_mode == interlace_mode && + asset.interlace_mode == interlace_mode && + asset.timecode == timecode && width == asset.width && height == asset.height && !strcmp(vcodec, asset.vcodec) && @@ -467,6 +475,7 @@ int Asset::read_video(FileXML *file) height = file->tag.get_property("HEIGHT", height); width = file->tag.get_property("WIDTH", width); proxy_scale = file->tag.get_property("PROXY_SCALE", 0); + proxy_edl = file->tag.get_property("PROXY_EDL", 0); layers = file->tag.get_property("LAYERS", layers); program = file->tag.get_property("PROGRAM", program); // This is loaded from the index file after the EDL but this @@ -476,6 +485,7 @@ int Asset::read_video(FileXML *file) file->tag.get_property("VCODEC", vcodec); video_length = file->tag.get_property("VIDEO_LENGTH", (int64_t)0); + timecode = file->tag.get_property("TIMECODE", -2); mov_sphere = file->tag.get_property("MOV_SPHERE", 0); jpeg_sphere = file->tag.get_property("JPEG_SPHERE", 0); single_frame = file->tag.get_property("SINGLE_FRAME", (int64_t)0); @@ -635,6 +645,7 @@ int Asset::write_video(FileXML *file) file->tag.set_property("HEIGHT", height); file->tag.set_property("WIDTH", width); file->tag.set_property("PROXY_SCALE", proxy_scale); + file->tag.set_property("PROXY_EDL", proxy_edl); file->tag.set_property("LAYERS", layers); file->tag.set_property("PROGRAM", program); file->tag.set_property("FRAMERATE", frame_rate); @@ -642,6 +653,7 @@ int Asset::write_video(FileXML *file) file->tag.set_property("VCODEC", vcodec); file->tag.set_property("VIDEO_LENGTH", video_length); + file->tag.set_property("TIMECODE", timecode); file->tag.set_property("MOV_SPHERE", mov_sphere); file->tag.set_property("JPEG_SPHERE", jpeg_sphere); file->tag.set_property("SINGLE_FRAME", single_frame); @@ -738,6 +750,7 @@ void Asset::load_defaults(BC_Hash *defaults, actual_height = GET_DEFAULT("ACTUAL_HEIGHT", actual_height); actual_width = GET_DEFAULT("ACTUAL_WIDTH", actual_width); proxy_scale = GET_DEFAULT("PROXY_SCALE", proxy_scale); + proxy_edl = GET_DEFAULT("PROXY_SCALE", proxy_edl); program = GET_DEFAULT("PROGRAM", program); layers = GET_DEFAULT("LAYERS", layers); if(EQUIV(frame_rate, 0)) frame_rate = GET_DEFAULT("FRAMERATE", frame_rate); @@ -803,6 +816,8 @@ void Asset::load_defaults(BC_Hash *defaults, ac3_bitrate = GET_DEFAULT("AC3_BITRATE", ac3_bitrate); png_use_alpha = GET_DEFAULT("PNG_USE_ALPHA", png_use_alpha); + png_depth = GET_DEFAULT("PNG_DEPTH", png_depth); + png_compression = GET_DEFAULT("PNG_COMPRESSION", png_compression); exr_use_alpha = GET_DEFAULT("EXR_USE_ALPHA", exr_use_alpha); exr_compression = GET_DEFAULT("EXR_COMPRESSION", exr_compression); tiff_cmodel = GET_DEFAULT("TIFF_CMODEL", tiff_cmodel); @@ -899,6 +914,8 @@ void Asset::save_defaults(BC_Hash *defaults, UPDATE_DEFAULT("PNG_USE_ALPHA", png_use_alpha); + UPDATE_DEFAULT("PNG_DEPTH", png_depth); + UPDATE_DEFAULT("PNG_COMPRESSION", png_compression); UPDATE_DEFAULT("EXR_USE_ALPHA", exr_use_alpha); UPDATE_DEFAULT("EXR_COMPRESSION", exr_compression); UPDATE_DEFAULT("TIFF_CMODEL", tiff_cmodel); @@ -937,6 +954,7 @@ void Asset::save_defaults(BC_Hash *defaults, UPDATE_DEFAULT("ACTUAL_HEIGHT", actual_height); UPDATE_DEFAULT("ACTUAL_WIDTH", actual_width); UPDATE_DEFAULT("PROXY_SCALE", proxy_scale); + UPDATE_DEFAULT("PROXY_EDL", proxy_edl); UPDATE_DEFAULT("PROGRAM", program); UPDATE_DEFAULT("LAYERS", layers); UPDATE_DEFAULT("FRAMERATE", frame_rate); @@ -982,11 +1000,10 @@ int Asset::dump(FILE *fp) " height %d vcodec %s aspect_ratio %f ilace_mode %s\n", video_data, layers, program, frame_rate, width, height, vcodec, aspect_ratio,string); - fprintf(fp," actual_width %d actual_height %d proxy_scale %d" - " video_length %jd repeat %d\n", - actual_width, actual_height, proxy_scale, video_length, - single_frame); - fprintf(fp," video_length %jd repeat %d\n", video_length, single_frame); + fprintf(fp," actual_width %d actual_height %d proxy_scale %d proxy_edl %d\n", + actual_width, actual_height, proxy_scale, proxy_edl); + fprintf(fp," video_length %jd repeat %d timecode %f\n", + video_length, single_frame, timecode); fprintf(fp," mov_sphere=%d jpeg_sphere=%d\n", mov_sphere, jpeg_sphere); return 0; }