X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=5910dd202474e59856cfbd9b22b598dff3aa2632;hp=4879ccc917153071fe50fc7a335868b4d165377e;hb=HEAD;hpb=edb7995d395b7fe861bf79b002fac2f19b141f49 diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index 4879ccc9..5910dd20 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -11,20 +11,26 @@ #include "bcwindowbase.h" #include "bitspopup.h" #include "ctype.h" +#include "edl.h" #include "ffmpeg.h" #include "filebase.h" #include "file.h" #include "fileffmpeg.h" #include "filesystem.h" #include "indexfile.h" +#include "language.h" #include "mainerror.h" #include "mainprogress.h" #include "mutex.h" #include "preferences.h" #include "videodevice.inc" +#ifdef FFMPEG3 +#define url filename +#endif + FileFFMPEG::FileFFMPEG(Asset *asset, File *file) - : FileBase(asset, file) + : FileBase(asset, file) { ff = 0; if(asset->format == FILE_UNKNOWN) @@ -39,8 +45,7 @@ FileFFMPEG::~FileFFMPEG() FFMpegConfigNum::FFMpegConfigNum(BC_Window *window, int x, int y, char *title_text, int *output) - : BC_TumbleTextBox(window, (int64_t)*output, - (int64_t)-1, (int64_t)25000000, 100, y, 100) + : BC_TumbleTextBox(window, *output, -1, INT_MAX, 100, y, 100) { this->window = window; this->x = x; this->y = y; @@ -58,9 +63,23 @@ void FFMpegConfigNum::create_objects() BC_TumbleTextBox::create_objects(); } +int FFMpegConfigNum::update_param(const char *param, const char *opts) +{ + char value[BCSTRLEN]; + if( !FFMPEG::get_ff_option(param, opts, value) ) { + if( (*output = atoi(value)) < 0 ) { + disable(1); + return 0; + } + } + BC_TumbleTextBox::update((int64_t)*output); + enable(); + return 1; +} + int FFMpegConfigNum::handle_event() { - *output = atol(get_text()); + *output = atoi(get_text()); return 1; } @@ -73,6 +92,22 @@ FFMpegAudioNum::FFMpegAudioNum(BC_Window *window, int FFMpegAudioBitrate::handle_event() { int ret = FFMpegAudioNum::handle_event(); + Asset *asset = window()->asset; + if( asset->ff_audio_bitrate > 0 ) + window()->quality->disable(); + else if( !window()->quality->get_textbox()->is_hidden() ) + window()->quality->enable(); + return ret; +} + +int FFMpegAudioQuality::handle_event() +{ + int ret = FFMpegAudioNum::handle_event(); + Asset *asset = window()->asset; + if( asset->ff_audio_quality >= 0 ) + window()->bitrate->disable(); + else if( !window()->bitrate->get_textbox()->is_hidden() ) + window()->bitrate->enable(); return ret; } @@ -86,9 +121,9 @@ int FFMpegVideoBitrate::handle_event() { int ret = FFMpegVideoNum::handle_event(); Asset *asset = window()->asset; - if( asset->ff_video_bitrate ) + if( asset->ff_video_bitrate > 0 ) window()->quality->disable(); - else + else if( !window()->quality->get_textbox()->is_hidden() ) window()->quality->enable(); return ret; } @@ -97,33 +132,114 @@ int FFMpegVideoQuality::handle_event() { int ret = FFMpegVideoNum::handle_event(); Asset *asset = window()->asset; - if( asset->ff_video_quality ) + if( asset->ff_video_quality >= 0 ) window()->bitrate->disable(); - else + else if( !window()->bitrate->get_textbox()->is_hidden() ) window()->bitrate->enable(); return ret; } +FFMpegPixelFormat::FFMpegPixelFormat(FFMPEGConfigVideo *vid_config, + int x, int y, int w, int list_h) + : BC_PopupTextBox(vid_config, 0, 0, x, y, w, list_h) +{ + this->vid_config = vid_config; +} + +int FFMpegPixelFormat::handle_event() +{ + strncpy(vid_config->asset->ff_pixel_format, get_text(), + sizeof(vid_config->asset->ff_pixel_format)); + return 1; +} + +void FFMpegPixelFormat::update_formats() +{ + pixfmts.remove_all_objects(); + char video_codec[BCSTRLEN]; video_codec[0] = 0; + const char *vcodec = vid_config->asset->vcodec; + AVCodec *av_codec = !FFMPEG::get_codec(video_codec, "video", vcodec) ? + avcodec_find_encoder_by_name(video_codec) : 0; + const AVPixelFormat *pix_fmts = av_codec ? av_codec->pix_fmts : 0; + if( pix_fmts ) { + for( int i=0; pix_fmts[i]>=0; ++i ) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmts[i]); + if( desc ) pixfmts.append(new BC_ListBoxItem(desc->name)); + } + } + update_list(&pixfmts); +} + +FFMpegSampleFormat::FFMpegSampleFormat(FFMPEGConfigAudio *aud_config, + int x, int y, int w, int list_h) + : BC_PopupTextBox(aud_config, 0, 0, x, y, w, list_h) +{ + this->aud_config = aud_config; +} + +int FFMpegSampleFormat::handle_event() +{ + strncpy(aud_config->asset->ff_sample_format, get_text(), + sizeof(aud_config->asset->ff_sample_format)); + return 1; +} + +void FFMpegSampleFormat::update_formats() +{ + samplefmts.remove_all_objects(); + char audio_codec[BCSTRLEN]; audio_codec[0] = 0; + const char *acodec = aud_config->asset->acodec; + AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio", acodec) ? + avcodec_find_encoder_by_name(audio_codec) : 0; + const AVSampleFormat *sample_fmts = av_codec ? av_codec->sample_fmts : 0; + if( sample_fmts ) { + for( int i=0; sample_fmts[i]>=0; ++i ) { + const char *name = av_get_sample_fmt_name(sample_fmts[i]); + if( name ) samplefmts.append(new BC_ListBoxItem(name)); + } + } + update_list(&samplefmts); +} + +void FileFFMPEG::set_options(char *cp, int len, const char *bp) +{ + char *ep = cp + len-2, ch = 0; + while( cp < ep && *bp != 0 ) { ch = *bp++; *cp++ = ch; } + if( ch != '\n' ) *cp++ = '\n'; + *cp = 0; +} + void FileFFMPEG::get_parameters(BC_WindowBase *parent_window, Asset *asset, BC_WindowBase *&format_window, - int audio_options, int video_options) + int audio_options, int video_options, EDL *edl) { - if(audio_options) { - FFMPEGConfigAudio *window = new FFMPEGConfigAudio(parent_window, asset); + Asset *ff_asset = new Asset(); + ff_asset->copy_from(asset, 0); + if( audio_options ) { + FFMPEGConfigAudio *window = new FFMPEGConfigAudio(parent_window, ff_asset, edl); format_window = window; window->create_objects(); - if( !window->run_window() ) - strcpy(asset->ff_audio_options, window->audio_options->get_text()); + if( !window->run_window() ) { + asset->copy_from(ff_asset,0); + set_options(asset->ff_audio_options, + sizeof(asset->ff_audio_options), + window->audio_options->get_text()); + } delete window; } - else if(video_options) { - FFMPEGConfigVideo *window = new FFMPEGConfigVideo(parent_window, asset); + else if( video_options ) { + FFMPEGConfigVideo *window = new FFMPEGConfigVideo(parent_window, ff_asset, edl); format_window = window; window->create_objects(); - if( !window->run_window() ) - strcpy(asset->ff_video_options, window->video_options->get_text()); + if( !window->run_window() ) { + asset->copy_from(ff_asset,0); + set_options(asset->ff_video_options, + sizeof(asset->ff_video_options), + window->video_options->get_text()); + } delete window; } + ff_asset->remove_user(); } int FileFFMPEG::check_sig(Asset *asset) @@ -186,7 +302,6 @@ int FileFFMPEG::select_video_stream(Asset *asset, int vstream) if( !ff || !asset->video_data ) return 1; asset->width = ff->ff_video_width(vstream); asset->height = ff->ff_video_height(vstream); - asset->video_length = ff->ff_video_frames(vstream); if( (asset->video_length = ff->ff_video_frames(vstream)) < 2 ) asset->video_length = asset->video_length < 0 ? 0 : -1; asset->frame_rate = ff->ff_frame_rate(vstream); @@ -217,6 +332,7 @@ int FileFFMPEG::open_file(int rd, int wr) asset->channels = audio_channels; asset->sample_rate = ff->ff_sample_rate(0); asset->audio_length = ff->ff_audio_samples(0); + strcpy(asset->acodec, ff->ff_audio_format(0)); } int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { @@ -230,6 +346,7 @@ int FileFFMPEG::open_file(int rd, int wr) (asset->video_length = ff->ff_video_frames(0)) < 2 ) asset->video_length = asset->video_length < 0 ? 0 : -1; if( !asset->frame_rate ) asset->frame_rate = ff->ff_frame_rate(0); + strcpy(asset->vcodec, ff->ff_video_format(0)); } IndexState *index_state = asset->index_state; index_state->read_markers(file->preferences->index_directory, asset->path); @@ -310,18 +427,37 @@ int FileFFMPEG::colormodel_supported(int colormodel) return colormodel; } + +int FileFFMPEG::get_best_colormodel(int driver, int vstream) +{ + if( vstream < 0 ) vstream = 0; + int is_mpeg = !ff ? 0 : ff->ff_video_mpeg_color_range(vstream); + + switch(driver) { + case PLAYBACK_X11: + case PLAYBACK_X11_GL: return is_mpeg ? BC_YUV888 : BC_RGB888; + case PLAYBACK_X11_XV: return BC_YUV420P; + } + + return BC_RGB888; +} + int FileFFMPEG::get_best_colormodel(Asset *asset, int driver) { switch(driver) { - case PLAYBACK_X11: return BC_RGB888; - case PLAYBACK_X11_GL: return BC_YUV888; +// the direct X11 color model requires scaling in the codec + case SCREENCAPTURE: + case PLAYBACK_X11: + case PLAYBACK_X11_GL: return BC_RGB888; + case PLAYBACK_X11_XV: return BC_YUV420P; } + return BC_YUV420P; } //====== -FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset) +FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset, EDL *edl) : BC_Window(_(PROGRAM_NAME ": Audio Preset"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), @@ -329,6 +465,7 @@ FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset) { this->parent_window = parent_window; this->asset = asset; + this->edl = edl; preset_popup = 0; bitrate = 0; @@ -345,6 +482,11 @@ FFMPEGConfigAudio::~FFMPEGConfigAudio() unlock_window(); } +void FFMPEGConfigAudio::load_options() +{ + FFMPEG::load_audio_options(asset, edl); +} + void FFMPEGConfigAudio::create_objects() { int x = 10, y = 10; @@ -383,8 +525,26 @@ void FFMPEGConfigAudio::create_objects() bitrate = new FFMpegAudioBitrate(this, x, y, _("Bitrate:"), &asset->ff_audio_bitrate); bitrate->create_objects(); bitrate->set_increment(1000); + bitrate->set_boundaries((int64_t)0, (int64_t)INT_MAX); + y += bitrate->get_h() + 5; + quality = new FFMpegAudioQuality(this, x, y, _("Quality:"), &asset->ff_audio_quality); + quality->create_objects(); + quality->set_increment(1); + quality->set_boundaries((int64_t)-1, (int64_t)51); + y += quality->get_h() + 10; + + add_subwindow(new BC_Title(x, y, _("Samples:"))); + sample_format = new FFMpegSampleFormat(this, x+90, y, 100, 120); + sample_format->create_objects(); + if( asset->acodec[0] ) { + sample_format->update_formats(); + if( !asset->ff_audio_options[0] ) + load_options(); + } + if( !asset->ff_sample_format[0] ) strcpy(asset->ff_sample_format, _("None")); + sample_format->update(asset->ff_sample_format); + y += sample_format->get_h() + 10; - y += bitrate->get_h() + 10; BC_Title *title = new BC_Title(x, y, _("Audio Options:")); add_subwindow(title); @@ -393,20 +553,19 @@ void FFMPEGConfigAudio::create_objects() add_subwindow(new FFOptionsViewAudio(this, x1, y, _("view"))); y += 25; - if( !asset->ff_audio_options[0] && asset->acodec[0] ) { - FFMPEG::set_option_path(option_path, "audio/%s", asset->acodec); - FFMPEG::load_options(option_path, asset->ff_audio_options, - sizeof(asset->ff_audio_options)); - } - - audio_options = new FFAudioOptions(this, x, y, get_w()-x-20, 10, + audio_options = new FFAudioOptions(this, x, y, get_w()-x-20, 8, sizeof(asset->ff_audio_options)-1, asset->ff_audio_options); audio_options->create_objects(); add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); - show_window(1); - bitrate->handle_event(); + + bitrate->update_param("cin_bitrate", asset->ff_audio_options); + quality->update_param("cin_quality", asset->ff_audio_options); + + if( asset->ff_audio_bitrate > 0 ) quality->disable(); + else if( asset->ff_audio_quality >= 0 ) bitrate->disable(); + unlock_window(); } @@ -423,12 +582,6 @@ FFAudioOptions::FFAudioOptions(FFMPEGConfigAudio *audio_popup, this->audio_popup = audio_popup; } -int FFAudioOptions::handle_event() -{ - strcpy(audio_popup->asset->ff_audio_options, get_text()); - return 1; -} - FFMPEGConfigAudioPopup::FFMPEGConfigAudioPopup(FFMPEGConfigAudio *popup, int x, int y) : BC_PopupTextBox(popup, &popup->presets, popup->asset->acodec, x, y, 300, 300) @@ -439,12 +592,16 @@ FFMPEGConfigAudioPopup::FFMPEGConfigAudioPopup(FFMPEGConfigAudio *popup, int x, int FFMPEGConfigAudioPopup::handle_event() { strcpy(popup->asset->acodec, get_text()); + popup->sample_format->update_formats(); Asset *asset = popup->asset; - char option_path[BCTEXTLEN]; - FFMPEG::set_option_path(option_path, "audio/%s", asset->acodec); - FFMPEG::load_options(option_path, asset->ff_audio_options, - sizeof(asset->ff_audio_options)); + asset->ff_audio_bitrate = 0; asset->ff_audio_quality = -1; + popup->load_options(); popup->audio_options->update(asset->ff_audio_options); + popup->audio_options->set_text_row(0); + + popup->bitrate->update_param("cin_bitrate", asset->ff_audio_options); + popup->quality->update_param("cin_quality", asset->ff_audio_options); + popup->sample_format->update(asset->ff_sample_format); return 1; } @@ -464,7 +621,7 @@ int FFMPEGConfigAudioToggle::handle_event() //====== -FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) +FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset, EDL *edl) : BC_Window(_(PROGRAM_NAME ": Video Preset"), parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1), @@ -472,7 +629,10 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) { this->parent_window = parent_window; this->asset = asset; + this->edl = edl; preset_popup = 0; + ff_options_dialog = 0; + pixel_format = 0; bitrate = 0; quality = 0; @@ -481,13 +641,19 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset) FFMPEGConfigVideo::~FFMPEGConfigVideo() { - delete ff_options_dialog; lock_window("FFMPEGConfigVideo::~FFMPEGConfigVideo"); - if(preset_popup) delete preset_popup; + delete ff_options_dialog; + delete pixel_format; + delete preset_popup; presets.remove_all_objects(); unlock_window(); } +void FFMPEGConfigVideo::load_options() +{ + FFMPEG::load_video_options(asset, edl); +} + void FFMPEGConfigVideo::create_objects() { int x = 10, y = 10; @@ -523,22 +689,34 @@ void FFMPEGConfigVideo::create_objects() preset_popup = new FFMPEGConfigVideoPopup(this, x, y); preset_popup->create_objects(); - if( asset->ff_video_bitrate && asset->ff_video_quality ) { - asset->ff_video_bitrate = 0; - asset->ff_video_quality = 0; + if( asset->ff_video_bitrate > 0 && asset->ff_video_quality >= 0 ) { + asset->ff_video_bitrate = 0; asset->ff_video_quality = -1; } y += 50; bitrate = new FFMpegVideoBitrate(this, x, y, _("Bitrate:"), &asset->ff_video_bitrate); bitrate->create_objects(); bitrate->set_increment(100000); + bitrate->set_boundaries((int64_t)0, (int64_t)INT_MAX); y += bitrate->get_h() + 5; quality = new FFMpegVideoQuality(this, x, y, _("Quality:"), &asset->ff_video_quality); quality->create_objects(); quality->set_increment(1); - quality->set_boundaries((int64_t)0, (int64_t)31); - + quality->set_boundaries((int64_t)-1, (int64_t)51); y += quality->get_h() + 10; + + add_subwindow(new BC_Title(x, y, _("Pixels:"))); + pixel_format = new FFMpegPixelFormat(this, x+90, y, 100, 120); + pixel_format->create_objects(); + if( asset->vcodec[0] ) { + pixel_format->update_formats(); + if( !asset->ff_video_options[0] ) + load_options(); + } + if( !asset->ff_pixel_format[0] ) strcpy(asset->ff_pixel_format, _("None")); + pixel_format->update(asset->ff_pixel_format); + y += pixel_format->get_h() + 10; + BC_Title *title = new BC_Title(x, y, _("Video Options:")); add_subwindow(title); @@ -547,23 +725,18 @@ void FFMPEGConfigVideo::create_objects() add_subwindow(new FFOptionsViewVideo(this, x1, y, _("view"))); y += 25; - if( !asset->ff_video_options[0] && asset->vcodec[0] ) { - FFMPEG::set_option_path(option_path, "video/%s", asset->vcodec); - FFMPEG::load_options(option_path, asset->ff_video_options, - sizeof(asset->ff_video_options)); - } - - video_options = new FFVideoOptions(this, x, y, get_w()-x-20, 10, + video_options = new FFVideoOptions(this, x, y, get_w()-x-20, 8, sizeof(asset->ff_video_options)-1, asset->ff_video_options); video_options->create_objects(); add_subwindow(new BC_OKButton(this)); add_subwindow(new BC_CancelButton(this)); - show_window(1); - if( asset->ff_video_bitrate ) - quality->disable(); - if( asset->ff_video_quality ) - bitrate->disable(); + + bitrate->update_param("cin_bitrate", asset->ff_video_options); + quality->update_param("cin_quality", asset->ff_video_options); + + if( asset->ff_video_bitrate > 0 ) quality->disable(); + else if( asset->ff_video_quality >= 0 ) bitrate->disable(); unlock_window(); } @@ -580,12 +753,6 @@ FFVideoOptions::FFVideoOptions(FFMPEGConfigVideo *video_popup, this->video_popup = video_popup; } -int FFVideoOptions::handle_event() -{ - strcpy(video_popup->asset->ff_video_options, get_text()); - return 1; -} - FFMPEGConfigVideoPopup::FFMPEGConfigVideoPopup(FFMPEGConfigVideo *popup, int x, int y) : BC_PopupTextBox(popup, &popup->presets, popup->asset->vcodec, x, y, 300, 300) @@ -596,12 +763,16 @@ FFMPEGConfigVideoPopup::FFMPEGConfigVideoPopup(FFMPEGConfigVideo *popup, int x, int FFMPEGConfigVideoPopup::handle_event() { strcpy(popup->asset->vcodec, get_text()); + popup->pixel_format->update_formats(); Asset *asset = popup->asset; - char option_path[BCTEXTLEN]; - FFMPEG::set_option_path(option_path, "video/%s", asset->vcodec); - FFMPEG::load_options(option_path, asset->ff_video_options, - sizeof(asset->ff_video_options)); + asset->ff_video_bitrate = 0; asset->ff_video_quality = -1; + popup->load_options(); popup->video_options->update(asset->ff_video_options); + popup->video_options->set_text_row(0); + + popup->bitrate->update_param("cin_bitrate", asset->ff_video_options); + popup->quality->update_param("cin_quality", asset->ff_video_options); + popup->pixel_format->update(asset->ff_pixel_format); return 1; } @@ -669,7 +840,7 @@ int FileFFMPEG::get_index(IndexFile *index_file, MainProgressBar *progress_bar) } FileSystem fs; - int64_t file_bytes = fs.get_size(ff->fmt_ctx->filename); + int64_t file_bytes = fs.get_size(ff->fmt_ctx->url); char *index_path = index_file->index_filename; int canceled = 0; @@ -717,7 +888,7 @@ FFOptions_OptPanel:: void FFOptions_OptPanel::create_objects() { - const char *cols[] = { "option", "value", }; + const char *cols[] = { _("option"), _("value"), }; const int col1_w = 150; int wids[] = { col1_w, get_w()-col1_w }; BC_ListBox::update(&items[0], &cols[0], &wids[0], sizeof(items)/sizeof(items[0])); @@ -796,16 +967,16 @@ char *FFOptions_Opt::get(char *vp, int sz) void *obj = (void *)options->obj; uint8_t *bp = 0; if( av_opt_get(obj, opt->name, 0, &bp) >= 0 && bp != 0 ) { - const char *val = (const char *)bp; + const char *val = (const char *)bp; if( opt->unit && *val ) { int id = atoi(val); const char *uid = unit_name(id); if( uid ) val = uid; } - cp = sz >= 0 ? strncpy(vp,val,sz) : strcpy(vp, val); - if( sz > 0 ) vp[sz-1] = 0; - av_freep(&bp); - } + cp = sz >= 0 ? strncpy(vp,val,sz) : strcpy(vp, val); + if( sz > 0 ) vp[sz-1] = 0; + av_freep(&bp); + } return cp; } @@ -869,7 +1040,7 @@ int FFOptionsKind::handle_event() void FFOptionsKind::set(int k) { this->kind = k; - set_text(kinds[k]); + set_text(_(kinds[k])); } FFOptionsText:: @@ -998,6 +1169,9 @@ void FFOptions::initialize(FFOptionsWindow *win, int kind) if( dupl ) continue; FFOptions_Opt *fopt = new FFOptions_Opt(this, opt, opt->name); append(fopt); + AVDictionaryEntry *elem = av_dict_get(win->dialog->ff_opts, + opt->name, 0, AV_DICT_IGNORE_SUFFIX); + if( elem && elem->value ) fopt->set(elem->value); char val[BCTEXTLEN], *vp = fopt->get(val, sizeof(val)); fopt->item_value->update(vp); } @@ -1145,25 +1319,25 @@ int FFOptions_Opt::types(char *rp) { const char *cp = ""; if( opt ) switch (opt->type) { - case AV_OPT_TYPE_FLAGS: cp = ""; break; - case AV_OPT_TYPE_INT: cp = ""; break; - case AV_OPT_TYPE_INT64: cp = ""; break; - case AV_OPT_TYPE_DOUBLE: cp = ""; break; - case AV_OPT_TYPE_FLOAT: cp = ""; break; - case AV_OPT_TYPE_STRING: cp = ""; break; - case AV_OPT_TYPE_RATIONAL: cp = ""; break; - case AV_OPT_TYPE_BINARY: cp = ""; break; - case AV_OPT_TYPE_IMAGE_SIZE: cp = ""; break; - case AV_OPT_TYPE_VIDEO_RATE: cp = ""; break; - case AV_OPT_TYPE_PIXEL_FMT: cp = ""; break; - case AV_OPT_TYPE_SAMPLE_FMT: cp = ""; break; - case AV_OPT_TYPE_DURATION: cp = ""; break; - case AV_OPT_TYPE_COLOR: cp = ""; break; - case AV_OPT_TYPE_CHANNEL_LAYOUT: cp = ""; break; - case AV_OPT_TYPE_BOOL: cp = ""; break; - default: cp = ""; break; + case AV_OPT_TYPE_FLAGS: cp = N_(""); break; + case AV_OPT_TYPE_INT: cp = N_(""); break; + case AV_OPT_TYPE_INT64: cp = N_(""); break; + case AV_OPT_TYPE_DOUBLE: cp = N_(""); break; + case AV_OPT_TYPE_FLOAT: cp = N_(""); break; + case AV_OPT_TYPE_STRING: cp = N_(""); break; + case AV_OPT_TYPE_RATIONAL: cp = N_(""); break; + case AV_OPT_TYPE_BINARY: cp = N_(""); break; + case AV_OPT_TYPE_IMAGE_SIZE: cp = N_(""); break; + case AV_OPT_TYPE_VIDEO_RATE: cp = N_(""); break; + case AV_OPT_TYPE_PIXEL_FMT: cp = N_(""); break; + case AV_OPT_TYPE_SAMPLE_FMT: cp = N_(""); break; + case AV_OPT_TYPE_DURATION: cp = N_(""); break; + case AV_OPT_TYPE_COLOR: cp = N_(""); break; + case AV_OPT_TYPE_CHANNEL_LAYOUT: cp = N_(""); break; + case AV_OPT_TYPE_BOOL: cp = N_(""); break; + default: cp = N_(""); break; } - return sprintf(rp, "%s", cp); + return sprintf(rp, "%s", _(cp)); } int FFOptions_Opt::scalar(double d, char *rp) { @@ -1281,7 +1455,7 @@ const char *FFOptions_Opt::tip() FFOptionsWindow::FFOptionsWindow(FFOptionsDialog *dialog) - : BC_Window(PROGRAM_NAME ": Options", 60, 30, 640, 400) + : BC_Window(_(PROGRAM_NAME ": Options"), 60, 30, 640, 400) { this->dialog = dialog; this->selected = 0; @@ -1293,24 +1467,32 @@ FFOptionsWindow::~FFOptionsWindow() void FFOptionsWindow::create_objects() { + lock_window("FFOptionsWindow::create_objects"); BC_Title *title; - int x = 10, y = 10; - add_subwindow(title = new BC_Title(x, y, dialog->codec_name)); - y += title->get_h() + 10; - int x0 = x, y0 = y; - add_subwindow(title = new BC_Title(x0, y0, _("Type: "))); - x0 += title->get_w() + 8; - add_subwindow(type = new BC_Title(x0, y0, (char *)"")); - x0 = x + 150; - add_subwindow(title = new BC_Title(x0, y0, _("Range: "))); - x0 += title->get_w() + 8; - add_subwindow(range = new BC_Title(x0, y0, (char *)"")); - x0 = x; - y += title->get_h() + 10; - add_subwindow(units = new FFOptionsUnits(this, x0, y, 120)); - x0 += units->get_w() + 8; + int x0 = 10, y0 = 10; + int x = x0, y = y0; + add_subwindow(title = new BC_Title(x, y, _("Format: "))); + x += title->get_w(); + add_subwindow(new BC_Title(x, y, dialog->format_name)); + x = x0 + 150; + add_subwindow(title = new BC_Title(x, y, _("Codec: "))); + x += title->get_w(); + add_subwindow(new BC_Title(x, y, dialog->codec_name)); + + x = x0; y += title->get_h() + 10; y0 = y; + add_subwindow(title = new BC_Title(x, y, _("Type: "))); + x += title->get_w() + 8; + add_subwindow(type = new BC_Title(x, y, (char *)"")); + x = x0 + 150; + add_subwindow(title = new BC_Title(x, y, _("Range: "))); + x += title->get_w() + 8; + add_subwindow(range = new BC_Title(x, y, (char *)"")); + + x = x0; y += title->get_h() + 10; + add_subwindow(units = new FFOptionsUnits(this, x, y, 120)); + x += units->get_w() + 8; int x1 = get_w() - BC_GenericButton::calculate_w(this, _("Apply")) - 8; - add_subwindow(text = new FFOptionsText(this, x0, y, x1-x0 - 8)); + add_subwindow(text = new FFOptionsText(this, x, y, x1-x - 8)); add_subwindow(apply = new FFOptionsApply(this, x1, y)); y += units->get_h() + 10; add_subwindow(kind = new FFOptionsKind(this, x1, y0, apply->get_w())); @@ -1318,8 +1500,9 @@ void FFOptionsWindow::create_objects() const char *kind_text = _("Kind:"); x1 -= BC_Title::calculate_w(this, kind_text) + 8; add_subwindow(kind_title = new BC_Title(x1, y0, kind_text)); + y0 = y; - panel_x = x; panel_y = y; + panel_x = x0; panel_y = y0; panel_w = get_w()-10 - panel_x; panel_h = get_h()-10 - panel_y - BC_OKButton::calculate_h(); panel = new FFOptions_OptPanel(this, panel_x, panel_y, panel_w, panel_h); @@ -1330,6 +1513,7 @@ void FFOptionsWindow::create_objects() options.initialize(this, FF_KIND_CODEC); draw(); show_window(1); + unlock_window(); } void FFOptionsWindow::draw() @@ -1408,8 +1592,8 @@ void FFOptionsDialog::store_options(char *cp, int len) *cp = 0; } -void FFOptionsDialog::start(const char *codec_name, AVCodec *codec, - const char *options, int len) +void FFOptionsDialog::start(const char *format_name, const char *codec_name, + AVCodec *codec, const char *options, int len) { if( options_window ) { options_window->lock_window("FFOptionsDialog::start"); @@ -1418,6 +1602,7 @@ void FFOptionsDialog::start(const char *codec_name, AVCodec *codec, return; } + this->format_name = cstrdup(format_name); this->codec_name = cstrdup(codec_name); this->codec = codec; this->ff_opts = 0; @@ -1442,6 +1627,7 @@ void FFOptionsDialog::handle_done_event(int result) update_options(options); } options_window = 0; + delete [] format_name; format_name = 0; delete [] codec_name; codec_name = 0; av_dict_free(&ff_opts); } @@ -1489,17 +1675,19 @@ FFOptionsViewAudio::~FFOptionsViewAudio() int FFOptionsViewAudio::handle_event() { - AVCodec *codec = 0; + char audio_format[BCSTRLEN]; audio_format[0] = 0; char audio_codec[BCSTRLEN]; audio_codec[0] = 0; + AVCodec *codec = 0; Asset *asset = aud_config->asset; const char *name = asset->acodec; - if( !FFMPEG::get_codec(audio_codec, "audio", name) ) + if( !FFMPEG::get_format(audio_format, "audio", name) && + !FFMPEG::get_codec(audio_codec, "audio", name) ) codec = avcodec_find_encoder_by_name(audio_codec); if( !codec ) { eprintf(_("no codec named: %s: %s"), name, audio_codec); return 1; } - aud_config->ff_options_dialog->start(audio_codec, codec, + aud_config->ff_options_dialog->start(audio_format, audio_codec, codec, asset->ff_audio_options, sizeof(asset->ff_audio_options)); return 1; } @@ -1516,17 +1704,19 @@ FFOptionsViewVideo::~FFOptionsViewVideo() int FFOptionsViewVideo::handle_event() { - AVCodec *codec = 0; + char video_format[BCSTRLEN]; video_format[0] = 0; char video_codec[BCSTRLEN]; video_codec[0] = 0; + AVCodec *codec = 0; Asset *asset = vid_config->asset; const char *name = asset->vcodec; - if( !FFMPEG::get_codec(video_codec, "video", name) ) + if( !FFMPEG::get_format(video_format, "video", name) && + !FFMPEG::get_codec(video_codec, "video", name) ) codec = avcodec_find_encoder_by_name(video_codec); if( !codec ) { eprintf(_("no codec named: %s: %s"), name, video_codec); return 1; } - vid_config->ff_options_dialog->start(video_codec, codec, + vid_config->ff_options_dialog->start(video_format, video_codec, codec, asset->ff_video_options, sizeof(asset->ff_video_options)); return 1; }