path[0] = 0;
// Has to be unknown for file probing to succeed
format = FILE_UNKNOWN;
- fformat[0] = 0;
bits = 0;
byte_order = 0;
signed_ = 0;
strcpy(vcodec, "");
strcpy(acodec, "");
+ strcpy(fformat,"mp4");
ff_audio_options[0] = 0;
- ff_video_options[0] = 0;
+ ff_sample_format[0] = 0;
ff_audio_bitrate = 0;
+ ff_audio_quality = -1;
+ ff_video_options[0] = 0;
+ ff_pixel_format[0] = 0;
ff_video_bitrate = 0;
ff_video_quality = -1;
interlace_mode = ILACE_MODE_UNDETECTED;
interlace_fixmethod = ILACE_FIXMETHOD_NONE;
+ mp3_bitrate = 224;
ampeg_bitrate = 256;
ampeg_derivative = 3;
ac3_bitrate = 128;
png_use_alpha = 0;
+
exr_use_alpha = 0;
exr_compression = 0;
tiff_cmodel = 0;
tiff_compression = 0;
+ mov_sphere = 0;
+ jpeg_sphere = 0;
use_header = 1;
id = EDL::next_id();
- reset_timecode();
return 0;
}
//printf("Asset::boundaries %d %d %f\n", __LINE__, sample_rate, frame_rate);
}
-int Asset::reset_timecode()
-{
- strcpy(reel_name, "cin0000");
- reel_number = 0;
- tcstart = 0;
- tcend = 0;
- tcformat = 0;
-
- return 0;
-}
-
void Asset::copy_from(Asset *asset, int do_index)
{
copy_location(asset);
void Asset::copy_location(Asset *asset)
{
strcpy(path, asset->path);
- awindow_folder = asset->awindow_folder;
+ folder_no = asset->folder_no;
}
void Asset::copy_format(Asset *asset, int do_index)
strcpy(acodec, asset->acodec);
strcpy(ff_audio_options, asset->ff_audio_options);
- strcpy(ff_video_options, asset->ff_video_options);
+ strcpy(ff_sample_format, asset->ff_sample_format);
ff_audio_bitrate = asset->ff_audio_bitrate;
+ ff_audio_quality = asset->ff_audio_quality;
+ strcpy(ff_video_options, asset->ff_video_options);
+ strcpy(ff_pixel_format, asset->ff_pixel_format);
ff_video_bitrate = asset->ff_video_bitrate;
ff_video_quality = asset->ff_video_quality;
tiff_cmodel = asset->tiff_cmodel;
tiff_compression = asset->tiff_compression;
-
- strcpy(reel_name, asset->reel_name);
- reel_number = asset->reel_number;
- tcstart = asset->tcstart;
- tcend = asset->tcend;
- tcformat = asset->tcformat;
+
+
+ mov_sphere = asset->mov_sphere;
+ jpeg_sphere = asset->jpeg_sphere;
}
int64_t Asset::get_index_offset(int channel)
delete [] cp;
}
}
- if( strcmp(apath, tpath) ) result = 1;
+ if( strcmp(apath, tpath) ) result = 0;
delete [] apath;
delete [] tpath;
delete [] out_path;
}
- if(result && format == FILE_FFMPEG)
- result = !strcmp(fformat, asset.fformat);
+ if(result && format == FILE_FFMPEG && strcmp(fformat, asset.fformat) )
+ result = 0;
if(test_audio && result)
{
!strcmp(acodec, asset.acodec));
if(result && format == FILE_FFMPEG)
result = !strcmp(ff_audio_options, asset.ff_audio_options) &&
- ff_audio_bitrate == asset.ff_audio_bitrate;
-
+ !strcmp(ff_sample_format, asset.ff_sample_format) &&
+ ff_audio_bitrate == asset.ff_audio_bitrate &&
+ ff_audio_quality == asset.ff_audio_quality;
}
width == asset.width &&
height == asset.height &&
!strcmp(vcodec, asset.vcodec) &&
- strcmp(reel_name, asset.reel_name) == 0 &&
- reel_number == asset.reel_number &&
- tcstart == asset.tcstart &&
- tcend == asset.tcend &&
- tcformat == asset.tcformat);
+ mov_sphere == asset.mov_sphere &&
+ jpeg_sphere == asset.jpeg_sphere);
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;
}
else
if(file->tag.title_is("FOLDER"))
{
- const char *string = file->tag.get_property("NUMBER");
- awindow_folder = string ? atoi(string) :
- AWindowGUI::folder_number(file->read_text());
+ folder_no = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
}
else
if(file->tag.title_is("VIDEO"))
audio_length = file->tag.get_property("AUDIO_LENGTH", (int64_t)0);
acodec[0] = 0;
file->tag.get_property("ACODEC", acodec);
-
- if(!video_data)
- {
- tcstart = 0;
- tcend = audio_length;
- tcformat = 0;
- }
return 0;
}
file->tag.get_property("VCODEC", vcodec);
video_length = file->tag.get_property("VIDEO_LENGTH", (int64_t)0);
+ 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);
ilacefixmethod_to_xmltext(string, ILACE_FIXMETHOD_NONE);
interlace_fixmethod = ilacefixmethod_from_xmltext(file->tag.get_property("INTERLACE_FIXMETHOD",string), ILACE_FIXMETHOD_NONE);
- file->tag.get_property("REEL_NAME", reel_name);
- reel_number = file->tag.get_property("REEL_NUMBER", reel_number);
- tcstart = file->tag.get_property("TCSTART", tcstart);
- tcend = file->tag.get_property("TCEND", tcend);
- tcformat = file->tag.get_property("TCFORMAT", tcformat);
-
return 0;
}
file->append_newline();
file->tag.set_title("FOLDER");
- file->tag.set_property("NUMBER", awindow_folder);
+ file->tag.set_property("NUMBER", folder_no);
file->append_tag();
file->tag.set_title("/FOLDER");
file->append_tag();
file->tag.set_property("VCODEC", vcodec);
file->tag.set_property("VIDEO_LENGTH", video_length);
+ file->tag.set_property("MOV_SPHERE", mov_sphere);
+ file->tag.set_property("JPEG_SPHERE", jpeg_sphere);
file->tag.set_property("SINGLE_FRAME", single_frame);
file->tag.set_property("INTERLACE_AUTOFIX", interlace_autofixoption);
ilacefixmethod_to_xmltext(string, interlace_fixmethod);
file->tag.set_property("INTERLACE_FIXMETHOD", string);
-
- file->tag.set_property("REEL_NAME", reel_name);
- file->tag.set_property("REEL_NUMBER", reel_number);
- file->tag.set_property("TCSTART", tcstart);
- file->tag.set_property("TCEND", tcend);
- file->tag.set_property("TCFORMAT", tcformat);
-
file->append_tag();
if(video_data)
file->tag.set_title("/VIDEO");
theora_keyframe_force_frequency = GET_DEFAULT("THEORA_FORCE_KEYFRAME_FREQUENCY", theora_keyframe_force_frequency);
GET_DEFAULT("FF_AUDIO_OPTIONS", ff_audio_options);
+ GET_DEFAULT("FF_SAMPLE_FORMAT", ff_sample_format);
ff_audio_bitrate = GET_DEFAULT("FF_AUDIO_BITRATE", ff_audio_bitrate);
+ ff_audio_quality = GET_DEFAULT("FF_AUDIO_QUALITY", ff_audio_quality);
GET_DEFAULT("FF_VIDEO_OPTIONS", ff_video_options);
+ 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);
tiff_cmodel = GET_DEFAULT("TIFF_CMODEL", tiff_cmodel);
tiff_compression = GET_DEFAULT("TIFF_COMPRESSION", tiff_compression);
- GET_DEFAULT("REEL_NAME", reel_name);
- reel_number = GET_DEFAULT("REEL_NUMBER", reel_number);
- tcstart = GET_DEFAULT("TCSTART", tcstart);
- tcend = GET_DEFAULT("TCEND", tcend);
- tcformat = GET_DEFAULT("TCFORMAT", tcformat);
-
+ mov_sphere = GET_DEFAULT("MOV_SPHERE", mov_sphere);
+ jpeg_sphere = GET_DEFAULT("JPEG_SPHERE", jpeg_sphere);
boundaries();
}
UPDATE_DEFAULT("VORBIS_MAX_BITRATE", vorbis_max_bitrate);
UPDATE_DEFAULT("FF_AUDIO_OPTIONS", ff_audio_options);
+ UPDATE_DEFAULT("FF_SAMPLE_FORMAT", ff_sample_format);
UPDATE_DEFAULT("FF_AUDIO_BITRATE", ff_audio_bitrate);
+ UPDATE_DEFAULT("FF_AUDIO_QUALITY", ff_audio_quality);
UPDATE_DEFAULT("FF_VIDEO_OPTIONS", ff_video_options);
+ 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("EXR_COMPRESSION", exr_compression);
UPDATE_DEFAULT("TIFF_CMODEL", tiff_cmodel);
UPDATE_DEFAULT("TIFF_COMPRESSION", tiff_compression);
+
+
+
+ UPDATE_DEFAULT("MOV_SPHERE", mov_sphere);
+ UPDATE_DEFAULT("JPEG_SPHERE", jpeg_sphere);
}
+
+
+
if(do_bits)
{
UPDATE_DEFAULT("BITS", bits);
UPDATE_DEFAULT("SINGLE_FRAME", single_frame);
}
-
- UPDATE_DEFAULT("REEL_NAME", reel_name);
- UPDATE_DEFAULT("REEL_NUMBER", reel_number);
- UPDATE_DEFAULT("TCSTART", tcstart);
- UPDATE_DEFAULT("TCEND", tcend);
- UPDATE_DEFAULT("TCFORMAT", tcformat);
}
fprintf(fp," format %d\n", format);
fprintf(fp," fformat=\"%s\"\n", fformat);
fprintf(fp," ff_audio_options=\"%s\"\n", ff_audio_options);
+ fprintf(fp," ff_sample_format=\"%s\"\n", ff_sample_format);
fprintf(fp," ff_audio_bitrate=%d\n", ff_audio_bitrate);
+ fprintf(fp," ff_audio_quality=%d\n", ff_audio_quality);
fprintf(fp," ff_video_options=\"%s\"\n", ff_video_options);
+ 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," audio_data %d channels %d samplerate %d bits %d"
" height %d vcodec %4.4s aspect_ratio %f ilace_mode %s\n",
video_data, layers, program, frame_rate, width, height,
vcodec, aspect_ratio,string);
- fprintf(fp," reel_name %s reel_number %i tcstart %jd tcend %jd tcf %d\n",
- reel_name, reel_number, tcstart, tcend, tcformat);
fprintf(fp," video_length %jd repeat %d\n", video_length, single_frame);
-
-
+ printf(" mov_sphere=%d jpeg_sphere=%d\n", mov_sphere, jpeg_sphere);
return 0;
}
return 0;
}
-int Asset::set_timecode(char *tc, int format, int end)
-{
- int hr, min, sec;
-
- hr = ((int) tc[0] - 48) * 10 + (int) tc[1] - 48;
- min = ((int) tc[3] - 48) * 10 + (int) tc[4] - 48;
- sec = ((int) tc[6] - 48) * 10 + (int) tc[7] - 48;
-
- // This needs to be modified to handle drop-frame
-
- if(end)
- tcend = (int64_t) (((hr * 3600) + (min * 60) + sec) * frame_rate);
- else
- tcstart = (int64_t) (((hr * 3600) + (min * 60) + sec) * frame_rate);
-
- tcformat = format;
- return 0;
-}
-
-
projects / goodguy / history.git / blobdiff