X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbdcreate.C;h=e18ebee3cc830cf40bf9e20f37e1b5b8ed925c2b;hb=9e3d90a964c0fbe97c0b58235336a47111932d5d;hp=5251979e94b70b560a8345b76cdee91b65b4a548;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index 5251979e..e18ebee3 100644
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -41,9 +41,10 @@ static struct bd_format {
 } bd_formats[] = {
 // framerates are frames, not fields, per second, *=not standard
 	{ "1920x1080 29.97i",	1920,1080, 29.97,  1, ILACE_MODE_TOP_FIRST },
-	{ "1920x1080 29.97p*",	1920,1080, 29.97,  1, ILACE_MODE_NOTINTERLACED },
+	{ "1920x1080 29.97p*",	1920,1080, 29.97,  1, ILACE_MODE_FAKE_INTERLACE },
 	{ "1920x1080 24p",	1920,1080, 24.,    1, ILACE_MODE_NOTINTERLACED },
 	{ "1920x1080 25i",	1920,1080, 25.,    1, ILACE_MODE_TOP_FIRST },
+	{ "1920x1080 25p*",     1920,1080, 25.,    1, ILACE_MODE_FAKE_INTERLACE },
 	{ "1920x1080 23.976p",	1920,1080, 23.976, 1, ILACE_MODE_NOTINTERLACED },
 	{ "1440x1080 29.97i",	1440,1080, 29.97, -1, ILACE_MODE_TOP_FIRST },
 	{ "1440x1080 25i",	1440,1080, 25.,	  -1, ILACE_MODE_TOP_FIRST },
@@ -51,6 +52,8 @@ static struct bd_format {
 	{ "1440x1080 23.976p",	1440,1080, 23.976,-1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  59.94p",	1280,720,  59.94,  1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  50p",	1280,720,  50.,    1, ILACE_MODE_NOTINTERLACED },
+	{ "1280x720  29.97p*",  1280,720,  29.97,  1, ILACE_MODE_NOTINTERLACED },
+	{ "1280x720  25p*",     1280,720,  25.,    1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  24p",	1280,720,  24.,    1, ILACE_MODE_NOTINTERLACED },
 	{ "1280x720  23.976p",	1280,720,  23.976, 1, ILACE_MODE_NOTINTERLACED },
 	{ "720x576   25i",	 720,576,  25.,    0, ILACE_MODE_BOTTOM_FIRST },
@@ -320,21 +323,17 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
 	asset->ff_audio_bitrate = bd_kaudio_rate * 1000;
 
 	asset->video_data = 1;
-	strcpy(asset->vcodec, "bluray.m2ts");
+	const char *vcodec = "bluray.m2ts";
+	switch( asset->interlace_mode ) {
+	case ILACE_MODE_TOP_FIRST:    vcodec = "bluray_tff.m2ts";  break;
+	case ILACE_MODE_BOTTOM_FIRST: vcodec = "bluray_bff.m2ts";  break;
+	case ILACE_MODE_FAKE_INTERLACE : vcodec = "bluray_fakeinterlace.m2ts";  break;
+	}
+	strcpy(asset->vcodec, vcodec);
 	//mwindow->defaults->get("DEFAULT_BLURAY_VCODEC", asset->vcodec);
 	FFMPEG::set_option_path(option_path, "video/%s", asset->vcodec);
 	FFMPEG::load_options(option_path, asset->ff_video_options,
 		 sizeof(asset->ff_video_options));
-	const char *opts = 0;
-	switch( asset->interlace_mode ) {
-	case ILACE_MODE_TOP_FIRST:    opts = ":tff\n";  break;
-	case ILACE_MODE_BOTTOM_FIRST: opts = ":bff\n";  break;
-	}
-	if( opts ) {
-		int len = strlen(asset->ff_video_options);
-		char *cp = asset->ff_video_options + len-1;
-		strncpy(cp, opts, sizeof(asset->ff_video_options)-len);
-	}
 	asset->ff_video_bitrate = vid_bitrate;
 	asset->ff_video_quality = -1;
 	return 0;
@@ -478,7 +477,7 @@ BC_Window* CreateBD_Thread::new_gui()
 	int scr_x = mwindow->gui->get_screen_x(0, -1);
 	int scr_w = mwindow->gui->get_screen_w(0, -1);
 	int scr_h = mwindow->gui->get_screen_h(0, -1);
-	int w = xS(500), h = yS(290);
+	int w = xS(560), h = yS(290);
 	int x = scr_x + scr_w/2 - w/2, y = scr_h/2 - h/2;
 
 	gui = new CreateBD_GUI(this, x, y, w, h);
@@ -739,7 +738,7 @@ CreateBD_GUI::~CreateBD_GUI()
 
 void CreateBD_GUI::create_objects()
 {
-	int xs10 = xS(10), xs30 = xS(30), xs35 = xS(35);
+	int xs10 = xS(10), xs35 = xS(35);
 	int xs160 = xS(160), xs170 = xS(170);
 	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("CreateBD_GUI::create_objects");
@@ -782,7 +781,7 @@ void CreateBD_GUI::create_objects()
 	add_subwindow(standard);
 	standard->create_objects();
 	standard->set_text(bd_formats[thread->use_standard].name);
-	x0 -= xs30;
+	x0 -= xS(60);
 	title = new BC_Title(x0, y, _("Scale:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	x1 = x0+title->get_w()+padx;
@@ -1023,7 +1022,7 @@ int CreateBD_FormatItem::handle_event()
 
 
 CreateBD_Format::CreateBD_Format(CreateBD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, xS(180), bd_formats[gui->thread->use_standard].name, 1)
+ : BC_PopupMenu(x, y, xS(200), bd_formats[gui->thread->use_standard].name, 1)
 {
 	this->gui = gui;
 }
@@ -1078,7 +1077,7 @@ int CreateBD_ScaleItem::handle_event()
 
 
 CreateBD_Scale::CreateBD_Scale(CreateBD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, xS(100), "", 1)
+ : BC_PopupMenu(x, y, xS(140), "", 1)
 {
 	this->gui = gui;
 }