X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbdwrite.C;h=1b864bb9720ba91a82c06b20771ba08355ad7408;hb=refs%2Fheads%2Fmaster;hp=6a2b4ca3cb4b9bcec54d7b8620a74b51cafd7395;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/bdwrite.C b/cinelerra-5.1/cinelerra/bdwrite.C index 6a2b4ca3..1f7f027e 100644 --- a/cinelerra-5.1/cinelerra/bdwrite.C +++ b/cinelerra-5.1/cinelerra/bdwrite.C @@ -1,3 +1,23 @@ +/* + * CINELERRA + * Copyright (C) 2016-2020 William Morrow + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + //#include "bd.h" //This program was created by inverting libbluray, without any docs, // so it is probably got problems. Still, works on my Samsung player. @@ -38,7 +58,11 @@ #include #include #include +#if !defined (__FreeBSD__) #include +#else +#include +#endif #include #include // work arounds (centos) @@ -102,6 +126,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 +147,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 +674,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 +1247,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 +1535,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 +1936,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 +1966,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 +2425,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 +2516,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); @@ -2510,7 +2550,12 @@ static int field_probe(AVFormatContext *fmt_ctx, AVStream *st) AVDictionary *copts = 0; //av_dict_copy(&copts, opts, 0); AVCodecID codec_id = st->codecpar->codec_id; +#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(58,134,100) AVCodec *decoder = avcodec_find_decoder(codec_id); +#endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,16,100) + const AVCodec *decoder = avcodec_find_decoder(codec_id); +#endif AVCodecContext *ctx = avcodec_alloc_context3(decoder); if( !ctx ) { fprintf(stderr,"codec alloc failed\n"); @@ -2550,6 +2595,22 @@ static int field_probe(AVFormatContext *fmt_ctx, AVStream *st) av_packet_unref(&ipkt); av_frame_free(&ipic); avcodec_free_context(&ctx); + + if (ilaced < 0) { + fprintf(stderr, "warning bdwrite uses field into from stream \n", st->codecpar->field_order); + switch(st->codecpar->field_order) { + case AV_FIELD_TT: + case AV_FIELD_TB: + case AV_FIELD_BB: + case AV_FIELD_BT: + return 1; + case AV_FIELD_PROGRESSIVE: + return 0; + default: + return -1; + } + } + return ilaced; } @@ -2584,7 +2645,13 @@ int media_info::scan() stream *s = new stream(type, i); s->pid = st->id; AVCodecID codec_id = st->codecpar->codec_id; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,16,100) + const AVCodec *decoder = avcodec_find_decoder(codec_id); +#endif +#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(58,134,100) AVCodec *decoder = avcodec_find_decoder(codec_id); +#endif + s->ctx = avcodec_alloc_context3(decoder); if( !s->ctx ) { fprintf(stderr, "avcodec_alloc_context failed\n"); @@ -2593,7 +2660,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 +2674,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->format = bd_audio_format(st->codecpar->channels); + s->coding_type = bd_coding_type(codec_id); + s->format = bd_audio_format(st->codecpar->ch_layout.nb_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 +2860,7 @@ Media::add_movie(uint32_t *ops, int n) } int -Media::compose() +Media::compose(int ch_interval) { // movie bs.init(); @@ -2966,8 +3033,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; @@ -3138,14 +3208,22 @@ int main(int ac, char **av) { char *path = av[1]; - if( mkbdmv(path) ) return 1; + av_log_set_level(AV_LOG_FATAL); //av_log_set_level(AV_LOG_VERBOSE); //av_log_set_level(AV_LOG_DEBUG); Media media; media_info *mp = 0; - - for( int ii=2; iibrk = 1; - if( media.compose() ) { + if( media.compose(chapter_every_n_sec) ) { fprintf(stderr, "cant compose media\n"); return 1; }