}
void FileOGG::get_parameters(BC_WindowBase *parent_window,
- Asset *asset,
- BC_WindowBase* &format_window,
- int audio_options,
- int video_options)
+ Asset *asset, BC_WindowBase* &format_window,
+ int audio_options, int video_options, EDL *edl)
{
if(audio_options)
{
yuv.v += yuv.uv_stride * (yuv.uv_height - 1);
yuv.y_stride = - yuv.y_stride;
yuv.uv_stride = - yuv.uv_stride;*/
- VFrame *temp_frame = new VFrame(yuv.y,
- -1,
- 0,
- yuv.u - yuv.y,
- yuv.v - yuv.y,
- - yuv.y_stride,
- yuv.y_height,
- BC_YUV420P,
- - yuv.y_stride);
+ VFrame *temp_frame = new VFrame(yuv.y, -1, 0,
+ yuv.u - yuv.y, yuv.v - yuv.y, - yuv.y_stride,
+ yuv.y_height, BC_YUV420P, - yuv.y_stride);
// copy into temp frame...
BC_CModels::transfer(frame->get_rows(),
if (!temp_frame)
{
- temp_frame = new VFrame (0,
- -1,
- tf->ti.width,
- tf->ti.height,
- BC_YUV420P,
- -1);
+ temp_frame = new VFrame ( tf->ti.width, tf->ti.height, BC_YUV420P, 0);
}
VFrame *frame = frames[0][j];
int in_color_model = frame->get_color_model();
: BC_Window(_(PROGRAM_NAME ": Audio Compression"),
parent_window->get_abs_cursor_x(1),
parent_window->get_abs_cursor_y(1),
- 350,
- 250)
+ 350, 250)
{
this->parent_window = parent_window;
this->asset = asset;
: BC_Window(_(PROGRAM_NAME ": Video Compression"),
parent_window->get_abs_cursor_x(1),
parent_window->get_abs_cursor_y(1),
- 450,
- 220)
+ 450, 220)
{
this->parent_window = parent_window;
this->asset = asset;
y += 30;
add_subwindow(new BC_Title(x, y, _("Quality:")));
- add_subwindow(new BC_ISlider(x + 80,
- y,
- 0,
- 200,
- 200,
- 0,
- 63,
- asset->theora_quality,
- 0,
- 0,
- &asset->theora_quality));
-
+ add_subwindow(new BC_ISlider(x + 80, y, 0,
+ 200, 200, 0, 63,
+ asset->theora_quality, 0,
+ 0, &asset->theora_quality));
add_subwindow(fixed_quality = new OGGTheoraFixedQuality(x2, y, this));
y += 30;
}
-
-
int OGGConfigVideo::close_event()
{
set_done(0);
delete [] packages;
}
if (default_asset)
- delete default_asset;
+ default_asset->remove_user();
}
int PackagingEngineOGG::create_packages_single_farm(
EDL *edl,
Preferences *preferences,
- Asset *default_asset,
- double total_start,
+ Asset *default_asset,
+ double total_start,
double total_end)
{
this->total_start = total_start;
this->preferences = preferences;
-// We make A COPY of the asset, because we set audio_data = 0 on local asset which is the same copy as default_asset...
+// We make A COPY of the asset, because we set audio_data = 0 on local asset which is the same copy as default_asset...
// Should be taken care of somewhere else actually
this->default_asset = new Asset(*default_asset);
if (default_asset->audio_data)
{
packages[local_current_package] = new RenderPackage;
- sprintf(packages[current_package]->path, "%s.audio", default_asset->path);
+ snprintf(packages[current_package]->path,
+ sizeof(packages[current_package]->path),
+ "%s.audio", default_asset->path);
local_current_package++;
}
-
+
if (default_asset->video_data)
{
video_package_len = (total_len) / preferences->renderfarm_job_count;
int number_start; // Character in the filename path at which the number begins
int total_digits; // Total number of digits including padding the user specified.
- Render::get_starting_number(default_asset->path,
+ Render::get_starting_number(default_asset->path,
current_number,
- number_start,
+ number_start,
total_digits,
3);
for(int i = 0; i < preferences->renderfarm_job_count; i++)
{
RenderPackage *package = packages[local_current_package] = new RenderPackage;
- Render::create_filename(package->path,
- default_asset->path,
+ Render::create_filename(package->path,
+ default_asset->path,
current_number,
total_digits,
number_start);
return 0;
}
-RenderPackage* PackagingEngineOGG::get_package_single_farm(double frames_per_second,
+RenderPackage* PackagingEngineOGG::get_package_single_farm(double frames_per_second,
int client_number,
int use_local_rate)
{
result->audio_start = audio_position;
result->video_start = video_position;
- result->audio_end = audio_position +
+ result->audio_end = audio_position +
Units::round(video_package_len * default_asset->sample_rate);
- result->video_end = video_position +
+ result->video_end = video_position +
Units::round(video_package_len * default_asset->frame_rate);
// Last package... take it all!
- if (current_package == total_packages -1 )
+ if (current_package == total_packages -1 )
{
result->audio_end = audio_end;
result->video_end = video_end;
video_position = result->video_end;
}
-
+
current_package ++;
return result;
int64_t PackagingEngineOGG::get_progress_max()
{
- return Units::to_int64(default_asset->sample_rate *
+ return Units::to_int64(default_asset->sample_rate *
(total_end - total_start)) * 2+
- Units::to_int64(preferences->render_preroll *
+ Units::to_int64(preferences->render_preroll *
total_packages *
default_asset->sample_rate);
}
{
-// Mux audio and video into one file
+// Mux audio and video into one file
// First fix our asset... have to workaround the bug of corruption of local asset
// Render::check_asset(edl, *default_asset);
File *audio_file_gen = 0, *video_file_gen = 0;
FileOGG *video_file = 0, *audio_file = 0;
ogg_stream_state audio_in_stream, video_in_stream;
-
+
int local_current_package = 0;
if (default_asset->audio_data)
{
audio_asset = new Asset(packages[local_current_package]->path);
+ audio_asset->format = FILE_OGG;
local_current_package++;
audio_file_gen = new File();
if (default_asset->video_data)
{
video_asset = new Asset(packages[local_current_package]->path);
+ video_asset->format = FILE_OGG;
local_current_package++;
video_file_gen = new File();
ogg_stream_clear(&video_in_stream);
video_file_gen->close_file();
delete video_file_gen;
- delete video_asset;
+ if( video_asset ) video_asset->remove_user();
video_asset = new Asset(packages[local_current_package]->path);
+ video_asset->format = FILE_OGG;
local_current_package++;
video_file_gen = new File();
int64_t granulepos = op.granulepos;
if (granulepos != -1)
{
- // Fix granulepos!
+ // Fix granulepos!
int64_t rel_iframe = granulepos >> video_file->theora_keyframe_granule_shift;
int64_t rel_pframe = granulepos - (rel_iframe << video_file->theora_keyframe_granule_shift);
int64_t rel_current_frame = rel_iframe + rel_pframe;
current_frame = frame_offset + rel_current_frame;
int64_t abs_iframe = current_frame - rel_pframe;
-
+
op.granulepos = (abs_iframe << video_file->theora_keyframe_granule_shift) + rel_pframe;
-
-// printf("iframe: %i, pframe: %i, granulepos: %i, op.packetno %lli, abs_iframe: %i\n", rel_iframe, rel_pframe, granulepos, op.packetno, abs_iframe);
-
+
+// printf("iframe: %i, pframe: %i, granulepos: %i, op.packetno %lli, abs_iframe: %i\n", rel_iframe, rel_pframe, granulepos, op.packetno, abs_iframe);
+
}
ogg_stream_packetin (&output_file->tf->to, &op);
- output_file->tf->v_pkg++;
+ output_file->tf->v_pkg++;
}
}
if (audio_ready)
ogg_stream_packetout(&audio_in_stream, &op);
ogg_stream_packetin (&output_file->tf->vo, &op);
audio_packetno++;
- output_file->tf->a_pkg++;
+ output_file->tf->a_pkg++;
}
}
-
+
output_file->flush_ogg(0);
-
-
+
+
}
-
-// flush_ogg(1) is called on file closing time...
+
+// flush_ogg(1) is called on file closing time...
// output_file->flush_ogg(1);
// Just prevent thet write_samples and write_frames are called
output_file->final_write = 0;
-
+
if (default_asset->audio_data)
{
ogg_stream_clear(&audio_in_stream);
audio_file_gen->close_file();
delete audio_file_gen;
- delete audio_asset;
+ if( audio_asset )
+ audio_asset->remove_user();
}
if (default_asset->video_data)
{
ogg_stream_clear(&video_in_stream);
video_file_gen->close_file();
delete video_file_gen;
- delete video_asset;
+ if( video_asset )
+ video_asset->remove_user();
}
output_file_gen->close_file();
delete output_file_gen;
-// Now delete the temp files
- for(int i = 0; i < total_packages; i++)
- unlink(packages[i]->path);
+// don't delete the temp files, for now
+// for(int i = 0; i < total_packages; i++)
+// unlink(packages[i]->path);
return 0;
}
projects / goodguy / history.git / blobdiff