From: Good Guy Date: Mon, 18 Apr 2022 22:49:12 +0000 (-0600) Subject: Bluray enhancements by Andrew X-Git-Tag: 2022-04~3 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=172ef8e133b80572d7d81b06f6658ce89bf709a3;p=goodguy%2Fcinelerra.git Bluray enhancements by Andrew --- diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C index 150f835d..7420a31f 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.C +++ b/cinelerra-5.1/cinelerra/bdcreate.C @@ -24,8 +24,13 @@ #include #include #include +#if !defined(__FreeBSD__) #include #include +#else +#include +#include +#endif // BD Creation @@ -62,6 +67,14 @@ static struct bd_format { { "720x480 29.97p*", 720,480, 29.97, 0, ILACE_MODE_NOTINTERLACED }, }; +static struct bd_profile { + const char *name; +} bd_profiles[] = { + {"bluray.m2ts"}, + {"bluray_lpcm.m2ts"}, +}; + + const int64_t CreateBD_Thread::BD_SIZE = 25000000000; const int CreateBD_Thread::BD_STREAMS = 1; const int CreateBD_Thread::BD_WIDTH = 1920; @@ -144,10 +157,13 @@ int BD_BatchRenderJob::get_udfs_mount(char *udfs, char *mopts, char *mntpt) return ret; } + + char *BD_BatchRenderJob::create_script(EDL *edl, ArrayList *idxbls) { char script[BCTEXTLEN]; strcpy(script, edl_path); + FILE *fp = 0; char *bp = strrchr(script,'/'); int fd = -1; @@ -175,10 +191,15 @@ char *BD_BatchRenderJob::create_script(EDL *edl, ArrayList *idxbls) fprintf(fp,"sz=`du -cb $dir/bd.m2ts* | tail -1 | sed -e 's/[ ].*//'`\n"); fprintf(fp,"blks=$((sz/2048 + 4096))\n"); fprintf(fp,"rm -f %s\n", udfs); + fprintf(fp,"if [ -f bd.meta ]; then\n"); + fprintf(fp,"tsmuxer bd.meta $dir/bd.iso \n"); + fprintf(fp,"mv $dir/bd.iso $dir/bd.udfs\n"); + fprintf(fp,"else\n"); fprintf(fp,"mkudffs -b 2048 %s $blks\n", udfs); fprintf(fp,"mount %s%s\n", mopts, mntpt); fprintf(fp,"bdwrite %s $dir/bd.m2ts*\n",mntpt); fprintf(fp,"umount %s\n",mntpt); + fprintf(fp,"fi\n"); if( is_usr_mnt ) fprintf(fp,"mv -f %s $dir/bd.udfs\n", udfs); fprintf(fp,"echo To burn bluray, load writable media and run:\n"); @@ -204,6 +225,9 @@ CreateBD_Thread::CreateBD_Thread(MWindow *mwindow) this->use_resize_tracks = 0; this->use_labeled = 0; this->use_farmed = 0; + this->use_tsmuxer = 0; + + strcpy(use_profile,"bluray.m2ts"); this->bd_size = BD_SIZE; this->bd_width = BD_WIDTH; @@ -215,6 +239,7 @@ CreateBD_Thread::CreateBD_Thread(MWindow *mwindow) this->bd_max_bitrate = BD_MAX_BITRATE; this->bd_kaudio_rate = BD_KAUDIO_RATE; this->max_w = this->max_h = 0; + this->batchrender = 0; } CreateBD_Thread::~CreateBD_Thread() @@ -297,6 +322,41 @@ int CreateBD_Thread::create_bd_jobs(ArrayList *jobs, const char return 1; } + if (use_tsmuxer) { + char meta_script[BCTEXTLEN]; + strcpy(meta_script, "/"); + + FILE *fp = 0; + char *bp = strrchr(meta_script,'/'); + int fd = -1; + if( bp ) { + char script_filename[BCTEXTLEN]; + sprintf(script_filename, "%s/bd.meta", asset_dir); + strcpy(bp, script_filename); + fd = open(meta_script, O_WRONLY+O_CREAT+O_TRUNC, 0755); + } + if( fd >= 0 ) + fp = fdopen(fd, "w"); + if( !fp ) { + char err[BCTEXTLEN], msg[BCTEXTLEN]; + strerror_r(errno, err, sizeof(err)); + sprintf(msg, _("Unable to save: %s\n-- %s"), meta_script, err); + MainError::show_error(msg); + return 0; + } + + + fprintf(fp,"MUXOPT --blu-ray --hdmv-descriptors\n"); + fprintf(fp,"V_MPEG4/ISO/AVC, bd.m2ts, track=4113\n"); + if(!strcmp(use_profile, "bluray.m2ts")) + fprintf(fp,"A_AC3, bd.m2ts, track=4352\n"); + if(!strcmp(use_profile, "bluray_lpcm.m2ts")) + fprintf(fp,"A_LPCM, bd.m2ts, track=4352\n"); + fprintf(fp,"\n"); + fclose(fp); + + } + BatchRenderJob *job = new BD_BatchRenderJob(mwindow->preferences, use_labeled, use_farmed); jobs->append(job); @@ -316,7 +376,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList *jobs, const char strcpy(asset->fformat, "m2ts"); asset->audio_data = 1; - strcpy(asset->acodec, "bluray.m2ts"); + strcpy(asset->acodec, use_profile); //mwindow->defaults->get("DEFAULT_BLURAY_ACODEC", asset->acodec); FFMPEG::set_option_path(option_path, "audio/%s", asset->acodec); FFMPEG::load_options(option_path, asset->ff_audio_options, @@ -324,7 +384,7 @@ int CreateBD_Thread::create_bd_jobs(ArrayList *jobs, const char asset->ff_audio_bitrate = bd_kaudio_rate * 1000; asset->video_data = 1; - const char *vcodec = "bluray.m2ts"; + const char *vcodec = use_profile; switch( asset->interlace_mode ) { case ILACE_MODE_TOP_FIRST: vcodec = "bluray_tff.m2ts"; break; case ILACE_MODE_BOTTOM_FIRST: vcodec = "bluray_bff.m2ts"; break; @@ -419,6 +479,7 @@ void CreateBD_Thread::handle_close_event(int result) char asset_dir[BCTEXTLEN], jobs_path[BCTEXTLEN]; snprintf(asset_dir, sizeof(asset_dir), "%s/%s", tmp_path, asset_title); snprintf(jobs_path, sizeof(jobs_path), "%s/bd.jobs", asset_dir); + //batchrender->tsmuxered = use_tsmuxer; mwindow->batch_render->reset(jobs_path); int ret = create_bd_jobs(&mwindow->batch_render->jobs, asset_dir); mwindow->undo->update_undo_after(_("create bd"), LOAD_ALL); @@ -446,6 +507,7 @@ BC_Window* CreateBD_Thread::new_gui() use_resize_tracks = 0; use_labeled = 0; use_farmed = 0; + use_tsmuxer = 0; use_standard = !strcmp(mwindow->default_std(),"NTSC") ? BD_1920x1080_2997i : BD_1920x1080_25i; bd_size = BD_SIZE; @@ -478,7 +540,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(560), h = yS(290); + int w = xS(560), h = yS(340); int x = scr_x + scr_w/2 - w/2, y = scr_h/2 - h/2; gui = new CreateBD_GUI(this, x, y, w, h); @@ -707,6 +769,16 @@ CreateBD_WideAudio::~CreateBD_WideAudio() { } +CreateBD_UseTsmuxer::CreateBD_UseTsmuxer(CreateBD_GUI *gui, int x, int y) + : BC_CheckBox(x, y, &gui->thread->use_tsmuxer, _("use tsmuxer")) +{ + this->gui = gui; +} + +CreateBD_UseTsmuxer::~CreateBD_UseTsmuxer() +{ +} + CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h) : BC_Window(_(PROGRAM_NAME ": Create BD"), x, y, w, h, xS(50), yS(50), 1, 0, 1) @@ -721,6 +793,7 @@ CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h) disk_space = 0; standard = 0; scale = 0; + profile = 0; need_deinterlace = 0; need_inverse_telecine = 0; need_resize_tracks = 0; @@ -729,6 +802,7 @@ CreateBD_GUI::CreateBD_GUI(CreateBD_Thread *thread, int x, int y, int w, int h) need_wide_audio = 0; need_labeled = 0; need_farmed = 0; + need_tsmuxer = 0; ok = 0; cancel = 0; // *** CONTEXT_HELP *** @@ -741,8 +815,9 @@ CreateBD_GUI::~CreateBD_GUI() void CreateBD_GUI::create_objects() { + int xs1 = xS(1); int xs10 = xS(10), xs35 = xS(35); - int xs160 = xS(160), xs170 = xS(170); + int xs60 = xS(60), xs160 = xS(160), xs170 = xS(170); int ys5 = yS(5), ys10 = yS(10); lock_window("CreateBD_GUI::create_objects"); int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + ys5; @@ -778,7 +853,25 @@ void CreateBD_GUI::create_objects() media_size->update(media_sizes[0]->get_text()); disk_space->update(); y += disk_space->get_h() + pady/2; - title = new BC_Title(x, y, _("Format:"), MEDIUMFONT, YELLOW); + + title = new BC_Title(x, y, _("Profile:"), MEDIUMFONT, YELLOW); + add_subwindow(title); + int start_x = x; + x += title->get_w()+padx; + profile = new CreateBD_Profile(this, x, y); + profile->create_objects(); + profiles.append(new BC_ListBoxItem("bluray.m2ts")); + profiles.append(new BC_ListBoxItem("bluray_lpcm.m2ts")); +/* profiles.append(new BC_ListBoxItem("bluray_truehd.m2ts")); */ + profile->update_list(&profiles); + profile->update(profiles[0]->get_text()); + + x += profile->get_w()+padx; + need_tsmuxer = new CreateBD_UseTsmuxer(this, x, y); + add_subwindow(need_tsmuxer); + y += need_tsmuxer->get_h() + pady; + + title = new BC_Title(start_x, y, _("Format:"), MEDIUMFONT, YELLOW); add_subwindow(title); standard = new CreateBD_Format(this, title->get_w() + padx, y); add_subwindow(standard); @@ -793,15 +886,15 @@ void CreateBD_GUI::create_objects() scale->create_objects(); y += standard->get_h() + pady/2; x1 = x; int y1 = y; - need_deinterlace = new CreateBD_Deinterlace(this, x1, y); + need_deinterlace = new CreateBD_Deinterlace(this, start_x, y); add_subwindow(need_deinterlace); y += need_deinterlace->get_h() + pady/2; - need_histogram = new CreateBD_Histogram(this, x1, y); + need_histogram = new CreateBD_Histogram(this, start_x, y); add_subwindow(need_histogram); y += need_histogram->get_h() + pady/2; non_standard = new BC_Title(x1, y+ys5, "", MEDIUMFONT, RED); add_subwindow(non_standard); - x1 += xs160; y = y1; + x1 -= xs60; y = y1; need_inverse_telecine = new CreateBD_InverseTelecine(this, x1, y); add_subwindow(need_inverse_telecine); y += need_inverse_telecine->get_h() + pady/2; @@ -810,7 +903,7 @@ void CreateBD_GUI::create_objects() y += need_wide_audio->get_h() + pady/2; need_resize_tracks = new CreateBD_ResizeTracks(this, x1, y); add_subwindow(need_resize_tracks); - x1 += xs160; y = y1; + x1 += xs170; y = y1; need_labeled = new CreateBD_LabelChapters(this, x1, y); add_subwindow(need_labeled); y += need_labeled->get_h() + pady/2; @@ -818,7 +911,7 @@ void CreateBD_GUI::create_objects() add_subwindow(need_farmed); ok_w = BC_OKButton::calculate_w(); ok_h = BC_OKButton::calculate_h(); - ok_x = xs10; + ok_x = xs1; ok_y = get_h() - ok_h - xs10; ok = new CreateBD_OK(this, ok_x, ok_y); add_subwindow(ok); @@ -1121,3 +1214,18 @@ int CreateBD_MediaSize::handle_event() return 1; } +CreateBD_Profile::CreateBD_Profile(CreateBD_GUI *gui, int x, int y) + : BC_PopupTextBox(gui, 0, 0, x, y, xS(170),yS(50)) +{ + this->gui = gui; +} + +CreateBD_Profile::~CreateBD_Profile() +{ +} + +int CreateBD_Profile::handle_event() +{ + strcpy(gui->thread->use_profile, get_text()); + return 1; +} diff --git a/cinelerra-5.1/cinelerra/bdcreate.h b/cinelerra-5.1/cinelerra/bdcreate.h index 89ee83bb..793ba513 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.h +++ b/cinelerra-5.1/cinelerra/bdcreate.h @@ -30,6 +30,7 @@ public: static int get_udfs_mount(char *udfs, char *mopts, char *mntpt); BD_BatchRenderJob(Preferences *preferences, int labeled, int farmed); char *create_script(EDL *edl, ArrayList *idxbls); + int tsmuxered; }; @@ -57,11 +58,13 @@ public: CreateBD_GUI *gui; char asset_title[BCTEXTLEN]; char tmp_path[BCTEXTLEN]; + char use_profile[BCTEXTLEN]; int use_deinterlace, use_inverse_telecine; int use_scale, use_resize_tracks; int use_wide_audio, use_farmed; int use_histogram, use_labeled; int use_standard; + int use_tsmuxer; int64_t bd_size; int bd_width; @@ -74,6 +77,8 @@ public: double bd_kaudio_rate; int bd_interlace_mode; int max_w, max_h; + + BD_BatchRenderJob *batchrender; }; class CreateBD_OK : public BC_OKButton @@ -196,6 +201,17 @@ public: CreateBD_GUI *gui; }; + +class CreateBD_UseTsmuxer : public BC_CheckBox +{ +public: + CreateBD_UseTsmuxer(CreateBD_GUI *gui, int x, int y); + ~CreateBD_UseTsmuxer(); + + CreateBD_GUI *gui; +}; + + class CreateBD_GUI : public BC_Window { public: @@ -224,6 +240,7 @@ public: CreateBD_InverseTelecine *need_inverse_telecine; CreateBD_ResizeTracks *need_resize_tracks; CreateBD_Histogram *need_histogram; + CreateBD_UseTsmuxer *need_tsmuxer; BC_Title *non_standard; CreateBD_WideAudio *need_wide_audio; CreateBD_LabelChapters *need_labeled; @@ -232,6 +249,8 @@ public: CreateBD_OK *ok; int cancel_x, cancel_y, cancel_w, cancel_h; CreateBD_Cancel *cancel; + ArrayList profiles; + CreateBD_Profile *profile; }; class CreateBD_FormatItem : public BC_MenuItem @@ -290,4 +309,15 @@ public: CreateBD_GUI *gui; }; +class CreateBD_Profile : public BC_PopupTextBox +{ +public: + CreateBD_Profile(CreateBD_GUI *gui, int x, int y); + ~CreateBD_Profile(); + int handle_event(); + + CreateBD_GUI *gui; +}; + + #endif diff --git a/cinelerra-5.1/cinelerra/bdcreate.inc b/cinelerra-5.1/cinelerra/bdcreate.inc index d44320c6..45d9fc1e 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.inc +++ b/cinelerra-5.1/cinelerra/bdcreate.inc @@ -41,5 +41,7 @@ class CreateBD_GUI; class CreateBD_FormatItem; class CreateBD_Format; class CreateBD_MediaSize; +class CreateBD_Profile; +class CreateBD_UseTsmuxer; #endif diff --git a/cinelerra-5.1/cinelerra/bdwrite.C b/cinelerra-5.1/cinelerra/bdwrite.C index 6a2b4ca3..d2ae7e6f 100644 --- a/cinelerra-5.1/cinelerra/bdwrite.C +++ b/cinelerra-5.1/cinelerra/bdwrite.C @@ -38,7 +38,11 @@ #include #include #include +#if !defined (__FreeBSD__) #include +#else +#include +#endif #include #include // work arounds (centos) @@ -102,6 +106,7 @@ enum { BLURAY_STREAM_TYPE_VIDEO_VC1 = 0xea, BLURAY_STREAM_TYPE_VIDEO_H264 = 0x1b, BLURAY_STREAM_TYPE_VIDEO_H264_MVC = 0x20, + BLURAY_STREAM_TYPE_VIDEO_HEVC = 0x24, BLURAY_STREAM_TYPE_SUB_PG = 0x90, BLURAY_STREAM_TYPE_SUB_IG = 0x91, BLURAY_STREAM_TYPE_SUB_TEXT = 0x92, @@ -122,6 +127,7 @@ enum { BLURAY_VIDEO_FORMAT_720P = 5, // SMPTE 296M BLURAY_VIDEO_FORMAT_1080P = 6, // SMPTE 274M BLURAY_VIDEO_FORMAT_576P = 7, // ITU-R BT.1358 + BLURAY_VIDEO_FORMAT_2160P = 8, BLURAY_VIDEO_RATE_24000_1001 = 1, // 23.976 BLURAY_VIDEO_RATE_24 = 2, @@ -648,6 +654,10 @@ public: uint8_t subclip_id; uint8_t format; uint8_t rate; + uint8_t dynamic_range_type; + uint8_t color_space; + uint8_t cr_flag; + uint8_t hdr_plus_flag; uint8_t char_code; char lang[4]; @@ -1217,7 +1227,7 @@ public: ArrayList pl; void add_movie(uint32_t *ops, int n); - int compose(); + int compose(int ch_interval); int write(char *fn); Media() { path = 0; filename[0] = 0; } @@ -1505,6 +1515,7 @@ clpi_prog_stream::write() case BLURAY_STREAM_TYPE_VIDEO_MPEG2: case BLURAY_STREAM_TYPE_VIDEO_VC1: case BLURAY_STREAM_TYPE_VIDEO_H264: + case BLURAY_STREAM_TYPE_VIDEO_HEVC: case 0x20: bs.write(format, 4); bs.write(rate, 4); @@ -1905,24 +1916,24 @@ write() bs.write(stream_type, 8); switch (stream_type) { - case 0x01: + case 1: bs.write(pid, 16); break; - case 0x02: - case 0x04: + case 2: + case 4: bs.write(subpath_id, 8); bs.write(subclip_id, 8); bs.write(pid, 16); break; - case 0x03: + case 3: bs.write(subpath_id, 8); bs.write(pid, 16); break; default: - fprintf(stderr, "unrecognized stream type %02x\n", stream_type); + fprintf(stderr, "unrecognized mpls stream type %02x\n", stream_type); break; }; bs.padb(9 - strm.bs_posb(bs)); @@ -1935,6 +1946,7 @@ write() case BLURAY_STREAM_TYPE_VIDEO_MPEG2: case BLURAY_STREAM_TYPE_VIDEO_VC1: case BLURAY_STREAM_TYPE_VIDEO_H264: + case BLURAY_STREAM_TYPE_VIDEO_HEVC: bs.write(format, 4); bs.write(rate, 4); break; @@ -2393,45 +2405,51 @@ build_toc(clpi_ep_map_entry *map) const AVRational media_info::clk45k = { 1, 45000 }; -static int bd_stream_type(AVCodecID codec_id) +static int bd_coding_type(AVCodecID codec_id) { - int stream_type = 0; + int coding_type = 0; switch (codec_id) { case AV_CODEC_ID_MPEG1VIDEO: - stream_type = BLURAY_STREAM_TYPE_VIDEO_MPEG1; + coding_type = BLURAY_STREAM_TYPE_VIDEO_MPEG1; break; case AV_CODEC_ID_MPEG2VIDEO: - stream_type = BLURAY_STREAM_TYPE_VIDEO_MPEG2; + coding_type = BLURAY_STREAM_TYPE_VIDEO_MPEG2; break; case AV_CODEC_ID_H264: - stream_type = BLURAY_STREAM_TYPE_VIDEO_H264; + coding_type = BLURAY_STREAM_TYPE_VIDEO_H264; + break; + case AV_CODEC_ID_HEVC: + coding_type = BLURAY_STREAM_TYPE_VIDEO_HEVC; break; case AV_CODEC_ID_MP2: - stream_type = BLURAY_STREAM_TYPE_AUDIO_MPEG1; + coding_type = BLURAY_STREAM_TYPE_AUDIO_MPEG1; break; case AV_CODEC_ID_MP3: - stream_type = BLURAY_STREAM_TYPE_AUDIO_MPEG2; + coding_type = BLURAY_STREAM_TYPE_AUDIO_MPEG2; break; case AV_CODEC_ID_AC3: - stream_type = BLURAY_STREAM_TYPE_AUDIO_AC3; + coding_type = BLURAY_STREAM_TYPE_AUDIO_AC3; break; case AV_CODEC_ID_EAC3: - stream_type = BLURAY_STREAM_TYPE_AUDIO_AC3PLUS; + coding_type = BLURAY_STREAM_TYPE_AUDIO_AC3PLUS; break; case AV_CODEC_ID_DTS: - stream_type = BLURAY_STREAM_TYPE_AUDIO_DTS; + coding_type = BLURAY_STREAM_TYPE_AUDIO_DTS; break; case AV_CODEC_ID_TRUEHD: - stream_type = BLURAY_STREAM_TYPE_AUDIO_TRUHD; + coding_type = BLURAY_STREAM_TYPE_AUDIO_TRUHD; + break; + case AV_CODEC_ID_PCM_BLURAY: + coding_type = BLURAY_STREAM_TYPE_AUDIO_LPCM; break; case AV_CODEC_ID_HDMV_PGS_SUBTITLE: - stream_type = BLURAY_STREAM_TYPE_SUB_PG; + coding_type = BLURAY_STREAM_TYPE_SUB_PG; break; default: - fprintf(stderr, "unknown bluray stream type %s\n", avcodec_get_name(codec_id)); + fprintf(stderr, "unknown bluray codec type %s\n", avcodec_get_name(codec_id)); exit(1); } - return stream_type; + return coding_type; } static int bd_audio_format(int channels) @@ -2478,6 +2496,8 @@ static int bd_video_format(int w, int h, int ilace) if( w == 1280 && h == 720 /* && !ilace*/ ) return BLURAY_VIDEO_FORMAT_720P; if( w == 1440 && h == 1080 /* && ilace*/ ) return BLURAY_VIDEO_FORMAT_1080I; if( w == 1920 && h == 1080 /* && !ilace*/ ) return BLURAY_VIDEO_FORMAT_1080P; + if( w == 3840 && h == 2160 && !ilace ) return BLURAY_VIDEO_FORMAT_2160P; + fprintf(stderr, "unknown bluray video format %dx%d %silace\n", w, h, !ilace ? "not " : ""); exit(1); @@ -2593,7 +2613,7 @@ int media_info::scan() switch( type ) { case AVMEDIA_TYPE_VIDEO: { if( ep_pid < 0 ) ep_pid = st->id; - s->coding_type = bd_stream_type(codec_id); + s->coding_type = bd_coding_type(codec_id); int ilace = field_probe(fmt_ctx, st); if( ilace < 0 ) { fprintf(stderr, "interlace probe failed\n"); @@ -2607,13 +2627,13 @@ int media_info::scan() (double)st->sample_aspect_ratio.num / st->sample_aspect_ratio.den); break; } case AVMEDIA_TYPE_AUDIO: { - s->coding_type = bd_stream_type(codec_id); + s->coding_type = bd_coding_type(codec_id); s->format = bd_audio_format(st->codecpar->channels); s->rate = bd_audio_rate(st->codecpar->sample_rate); strcpy((char*)s->lang, "eng"); break; } case AVMEDIA_TYPE_SUBTITLE: { - s->coding_type = bd_stream_type(codec_id); + s->coding_type = bd_coding_type(codec_id); AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", 0, 0); strncpy((char*)s->lang, lang ? lang->value : "und", sizeof(s->lang)); break; } @@ -2793,7 +2813,7 @@ Media::add_movie(uint32_t *ops, int n) } int -Media::compose() +Media::compose(int ch_interval) { // movie bs.init(); @@ -2966,8 +2986,11 @@ Media::compose() } pp->play_item.append(pi); } -// chapter marks every ch_duration ticks - int64_t ch_duration = 45000 * 60*5; +// chapter marks every ch_duration seconds * 45Kticks, default 5 min + int PCR_FREQ = 45000; + if (ch_interval == 0) + ch_interval = 60*5; + int64_t ch_duration = PCR_FREQ * ch_interval; int64_t mrktm = ch_duration; int64_t plytm = 0; int pmark = 0, pitem = 0; @@ -3144,8 +3167,15 @@ main(int ac, char **av) //av_log_set_level(AV_LOG_DEBUG); Media media; media_info *mp = 0; + int start = 0, chapter_every_n_sec = 0; + + int opt = getopt(ac, av, "c:"); + if (opt == 'c') { + chapter_every_n_sec = optarg[0]; start = 3; } + else + start = 2; - for( int ii=2; iibrk = 1; - if( media.compose() ) { + if( media.compose(chapter_every_n_sec) ) { fprintf(stderr, "cant compose media\n"); return 1; } diff --git a/cinelerra-5.1/ffmpeg/audio/bluray_truehd.m2ts b/cinelerra-5.1/ffmpeg/audio/bluray_truehd.m2ts new file mode 100644 index 00000000..f1e34e6d --- /dev/null +++ b/cinelerra-5.1/ffmpeg/audio/bluray_truehd.m2ts @@ -0,0 +1,3 @@ +bluray truehd +id 0x1100 +strict -2