X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=fe169cbcd0d2623332b85f0135350ff39d72d388;hp=2856ed5c0dde278aa7661dfdaa322ca177671061;hb=1529091cdf16df199a901aabe6e8fa1813a933af;hpb=24d62aadcd7a6188aff573aaec22f31e3bba4a57 diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index 2856ed5c..fe169cbc 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -84,6 +84,7 @@ int Asset::init_values() strcpy(acodec, ""); strcpy(fformat,"mp4"); + ff_format_options[0] = 0; ff_audio_options[0] = 0; ff_sample_format[0] = 0; ff_audio_bitrate = 0; @@ -92,12 +93,12 @@ int Asset::init_values() ff_pixel_format[0] = 0; ff_video_bitrate = 0; ff_video_quality = -1; + ff_color_space = -1; + ff_color_range = -1; jpeg_quality = 80; aspect_ratio = -1; - interlace_autofixoption = ILACE_AUTOFIXOPTION_AUTO; interlace_mode = ILACE_MODE_UNDETECTED; - interlace_fixmethod = ILACE_FIXMETHOD_NONE; mp3_bitrate = 224; ampeg_bitrate = 256; @@ -132,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; @@ -161,6 +164,7 @@ void Asset::reset_video() layers = 0; actual_width = width = 0; actual_height = height = 0; + proxy_scale = 0; // not a proxy video_length = 0; single_frame = 0; vmpeg_cmodel = BC_YUV420P; @@ -200,6 +204,7 @@ void Asset::copy_format(Asset *asset, int do_index) audio_data = asset->audio_data; format = asset->format; strcpy(fformat, asset->fformat); + strcpy(ff_format_options, asset->ff_format_options); channels = asset->channels; sample_rate = asset->sample_rate; bits = asset->bits; @@ -210,9 +215,7 @@ void Asset::copy_format(Asset *asset, int do_index) mp3_bitrate = asset->mp3_bitrate; use_header = asset->use_header; aspect_ratio = asset->aspect_ratio; - interlace_autofixoption = asset->interlace_autofixoption; interlace_mode = asset->interlace_mode; - interlace_fixmethod = asset->interlace_fixmethod; video_data = asset->video_data; layers = asset->layers; @@ -222,6 +225,7 @@ void Asset::copy_format(Asset *asset, int do_index) height = asset->height; actual_width = asset->actual_width; actual_height = asset->actual_height; + proxy_scale = asset->proxy_scale; strcpy(vcodec, asset->vcodec); strcpy(acodec, asset->acodec); @@ -233,6 +237,8 @@ void Asset::copy_format(Asset *asset, int do_index) strcpy(ff_pixel_format, asset->ff_pixel_format); ff_video_bitrate = asset->ff_video_bitrate; ff_video_quality = asset->ff_video_quality; + ff_color_space = asset->ff_color_space; + ff_color_range = asset->ff_color_range; this->audio_length = asset->audio_length; this->video_length = asset->video_length; @@ -275,13 +281,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; } @@ -343,11 +350,12 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) delete [] out_path; } - if(result && format == FILE_FFMPEG && strcmp(fformat, asset.fformat) ) + if( result && format == FILE_FFMPEG && + (strcmp(fformat, asset.fformat) || + strcmp(ff_format_options, asset.ff_format_options)) ) result = 0; - if(test_audio && result) - { + if(test_audio && result) { result = (channels == asset.channels && sample_rate == asset.sample_rate && bits == asset.bits && @@ -356,7 +364,7 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) header == asset.header && dither == asset.dither && !strcmp(acodec, asset.acodec)); - if(result && format == FILE_FFMPEG) + if( result && format == FILE_FFMPEG ) result = !strcmp(ff_audio_options, asset.ff_audio_options) && !strcmp(ff_sample_format, asset.ff_sample_format) && ff_audio_bitrate == asset.ff_audio_bitrate && @@ -364,24 +372,23 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) } - if(test_video && result) - { + if(test_video && result) { result = (layers == asset.layers && program == asset.program && frame_rate == asset.frame_rate && - asset.interlace_autofixoption == interlace_autofixoption && asset.interlace_mode == interlace_mode && - interlace_fixmethod == asset.interlace_fixmethod && width == asset.width && height == asset.height && !strcmp(vcodec, asset.vcodec) && mov_sphere == asset.mov_sphere && jpeg_sphere == asset.jpeg_sphere); - if(result && format == FILE_FFMPEG) + if( result && format == FILE_FFMPEG ) result = !strcmp(ff_video_options, asset.ff_video_options) && !strcmp(ff_pixel_format, asset.ff_pixel_format) && ff_video_bitrate == asset.ff_video_bitrate && - ff_video_quality == asset.ff_video_quality; + ff_video_quality == asset.ff_video_quality && + ff_color_space == asset.ff_color_space && + ff_color_range == asset.ff_color_range; } return result; @@ -395,88 +402,38 @@ int Asset::test_path(const char *path) return 0; } -int Asset::read(FileXML *file, - int expand_relative) +int Asset::read(FileXML *file, int expand_relative) { int result = 0; - // Check for relative path. - if(expand_relative) - { + if( expand_relative ) { char new_path[BCTEXTLEN]; char asset_directory[BCTEXTLEN]; char input_directory[BCTEXTLEN]; FileSystem fs; - strcpy(new_path, path); fs.set_current_dir(""); - fs.extract_dir(asset_directory, path); - // No path in asset. // Take path of XML file. - if(!asset_directory[0]) - { + if( !asset_directory[0] ) { fs.extract_dir(input_directory, file->filename); - // Input file has a path if(input_directory[0]) - { fs.join_names(path, input_directory, new_path); - } } } - - while(!result) - { - result = file->read_tag(); - if(!result) - { - if(file->tag.title_is("/ASSET")) - { - result = 1; - } - else - if(file->tag.title_is("AUDIO")) - { - read_audio(file); - } - else - if(file->tag.title_is("AUDIO_OMIT")) - { - read_audio(file); - } - else - if(file->tag.title_is("FORMAT")) - { - const char *string = file->tag.get_property("TYPE"); - format = File::strtoformat(string); - use_header = - file->tag.get_property("USE_HEADER", use_header); - file->tag.get_property("FFORMAT", fformat); - } - else - if(file->tag.title_is("FOLDER")) - { - folder_no = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER); - } - else - if(file->tag.title_is("VIDEO")) - { - read_video(file); - } - else - if(file->tag.title_is("VIDEO_OMIT")) - { - read_video(file); - } - else - if(file->tag.title_is("INDEX")) - { - read_index(file); - } - } + while( !(result=file->read_tag()) ) { + if( file->tag.title_is("/ASSET") ) break; + if( file->tag.title_is("AUDIO") ) { read_audio(file); continue; } + if( file->tag.title_is("AUDIO_OMIT") ) { read_audio(file); continue; } + if( file->tag.title_is("FORMAT") ) { read_format(file); continue; } + if( file->tag.title_is("VIDEO") ) { read_video(file); continue; } + if( file->tag.title_is("VIDEO_OMIT") ) { read_video(file); continue; } + if( file->tag.title_is("INDEX") ) { read_index(file); continue; } + if( file->tag.title_is("FOLDER") ) + folder_no = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER); } boundaries(); @@ -512,6 +469,7 @@ int Asset::read_video(FileXML *file) actual_width = file->tag.get_property("ACTUAL_WIDTH", actual_width); height = file->tag.get_property("HEIGHT", height); width = file->tag.get_property("WIDTH", width); + proxy_scale = file->tag.get_property("PROXY_SCALE", 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 @@ -524,15 +482,21 @@ int Asset::read_video(FileXML *file) 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); - - interlace_autofixoption = file->tag.get_property("INTERLACE_AUTOFIX",0); - ilacemode_to_xmltext(string, ILACE_MODE_NOTINTERLACED); interlace_mode = ilacemode_from_xmltext(file->tag.get_property("INTERLACE_MODE",string), ILACE_MODE_NOTINTERLACED); - ilacefixmethod_to_xmltext(string, ILACE_FIXMETHOD_NONE); - interlace_fixmethod = ilacefixmethod_from_xmltext(file->tag.get_property("INTERLACE_FIXMETHOD",string), ILACE_FIXMETHOD_NONE); + return 0; +} +int Asset::read_format(FileXML *file) +{ + const char *string = file->tag.get_property("TYPE"); + format = File::strtoformat(string); + use_header = file->tag.get_property("USE_HEADER", use_header); + fformat[0] = 0; + file->tag.get_property("FFORMAT", fformat); + ff_format_options[0] = 0; + file->tag.get_property("FF_FORMAT_OPTIONS", ff_format_options); return 0; } @@ -590,6 +554,7 @@ int Asset::write(FileXML *file, File::formattostr(format)); file->tag.set_property("USE_HEADER", use_header); file->tag.set_property("FFORMAT", fformat); + file->tag.set_property("FF_FORMAT_OPTIONS", ff_format_options); file->append_tag(); file->tag.set_title("/FORMAT"); @@ -672,6 +637,7 @@ int Asset::write_video(FileXML *file) file->tag.set_property("ACTUAL_WIDTH", actual_width); file->tag.set_property("HEIGHT", height); file->tag.set_property("WIDTH", width); + file->tag.set_property("PROXY_SCALE", proxy_scale); file->tag.set_property("LAYERS", layers); file->tag.set_property("PROGRAM", program); file->tag.set_property("FRAMERATE", frame_rate); @@ -683,14 +649,9 @@ int Asset::write_video(FileXML *file) file->tag.set_property("JPEG_SPHERE", jpeg_sphere); file->tag.set_property("SINGLE_FRAME", single_frame); - file->tag.set_property("INTERLACE_AUTOFIX", interlace_autofixoption); - ilacemode_to_xmltext(string, interlace_mode); file->tag.set_property("INTERLACE_MODE", string); - ilacefixmethod_to_xmltext(string, interlace_fixmethod); - file->tag.set_property("INTERLACE_FIXMETHOD", string); - file->append_tag(); if(video_data) file->tag.set_title("/VIDEO"); @@ -750,6 +711,7 @@ void Asset::load_defaults(BC_Hash *defaults, format = GET_DEFAULT("FORMAT", format); use_header = GET_DEFAULT("USE_HEADER", use_header); GET_DEFAULT("FFORMAT", fformat); + GET_DEFAULT("FF_FORMAT_OPTIONS", ff_format_options); } if(do_data_types) @@ -778,6 +740,7 @@ void Asset::load_defaults(BC_Hash *defaults, width = GET_DEFAULT("WIDTH", width); actual_height = GET_DEFAULT("ACTUAL_HEIGHT", actual_height); actual_width = GET_DEFAULT("ACTUAL_WIDTH", actual_width); + proxy_scale = GET_DEFAULT("PROXY_SCALE", proxy_scale); program = GET_DEFAULT("PROGRAM", program); layers = GET_DEFAULT("LAYERS", layers); if(EQUIV(frame_rate, 0)) frame_rate = GET_DEFAULT("FRAMERATE", frame_rate); @@ -808,15 +771,15 @@ void Asset::load_defaults(BC_Hash *defaults, GET_DEFAULT("FF_PIXEL_FORMAT", ff_pixel_format); ff_video_bitrate = GET_DEFAULT("FF_VIDEO_BITRATE", ff_video_bitrate); ff_video_quality = GET_DEFAULT("FF_VIDEO_QUALITY", ff_video_quality); + ff_color_space = GET_DEFAULT("FF_COLOR_SPACE", ff_color_space); + ff_color_range = GET_DEFAULT("FF_COLOR_RANGE", ff_color_range); + GET_DEFAULT("FF_FORMAT_OPTIONS", ff_format_options); mp3_bitrate = GET_DEFAULT("MP3_BITRATE", mp3_bitrate); jpeg_quality = GET_DEFAULT("JPEG_QUALITY", jpeg_quality); aspect_ratio = GET_DEFAULT("ASPECT_RATIO", aspect_ratio); - - interlace_autofixoption = ILACE_AUTOFIXOPTION_AUTO; interlace_mode = ILACE_MODE_UNDETECTED; - interlace_fixmethod = ILACE_FIXMETHOD_UPONE; // MPEG format information vmpeg_iframe_distance = GET_DEFAULT("VMPEG_IFRAME_DISTANCE", vmpeg_iframe_distance); @@ -843,6 +806,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); @@ -873,6 +838,7 @@ void Asset::save_defaults(BC_Hash *defaults, UPDATE_DEFAULT("FORMAT", format); UPDATE_DEFAULT("USE_HEADER", use_header); UPDATE_DEFAULT("FFORMAT", fformat); + UPDATE_DEFAULT("FF_FORMAT_OPTIONS", ff_format_options); } if(do_data_types) @@ -902,6 +868,8 @@ void Asset::save_defaults(BC_Hash *defaults, UPDATE_DEFAULT("FF_PIXEL_FORMAT", ff_pixel_format); UPDATE_DEFAULT("FF_VIDEO_BITRATE", ff_video_bitrate); UPDATE_DEFAULT("FF_VIDEO_QUALITY", ff_video_quality); + UPDATE_DEFAULT("FF_COLOR_SPACE", ff_color_space); + UPDATE_DEFAULT("FF_COLOR_RANGE", ff_color_range); UPDATE_DEFAULT("THEORA_FIX_BITRATE", theora_fix_bitrate); UPDATE_DEFAULT("THEORA_BITRATE", theora_bitrate); @@ -936,6 +904,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); @@ -973,6 +943,7 @@ void Asset::save_defaults(BC_Hash *defaults, UPDATE_DEFAULT("WIDTH", width); UPDATE_DEFAULT("ACTUAL_HEIGHT", actual_height); UPDATE_DEFAULT("ACTUAL_WIDTH", actual_width); + UPDATE_DEFAULT("PROXY_SCALE", proxy_scale); UPDATE_DEFAULT("PROGRAM", program); UPDATE_DEFAULT("LAYERS", layers); UPDATE_DEFAULT("FRAMERATE", frame_rate); @@ -1005,6 +976,8 @@ int Asset::dump(FILE *fp) fprintf(fp," ff_pixel_format=\"%s\"\n", ff_pixel_format); fprintf(fp," ff_video_bitrate=%d\n", ff_video_bitrate); fprintf(fp," ff_video_quality=%d\n", ff_video_quality); + fprintf(fp," ff_color_space=%d\n", ff_color_space); + fprintf(fp," ff_color_range=%d\n", ff_color_range); fprintf(fp," audio_data %d channels %d samplerate %d bits %d" " byte_order %d signed %d header %d dither %d acodec %4.4s\n", audio_data, channels, sample_rate, bits, byte_order, signed_, @@ -1013,11 +986,15 @@ int Asset::dump(FILE *fp) char string[BCTEXTLEN]; ilacemode_to_xmltext(string, interlace_mode); fprintf(fp," video_data %d program %d layers %d framerate %f width %d" - " height %d vcodec %4.4s aspect_ratio %f ilace_mode %s\n", + " 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); - printf(" mov_sphere=%d jpeg_sphere=%d\n", mov_sphere, jpeg_sphere); + fprintf(fp," mov_sphere=%d jpeg_sphere=%d\n", mov_sphere, jpeg_sphere); return 0; }