- Cin - Cinelerra-GG Mailing Lists

Interlace/aspect autodetect patch, hopefully this time working.
by Andrew Randrianasulu 16 Nov '20

16 Nov '20

I tested it with wmv, mpeg, mov, mp4 files. interlace_from_codec in asset info still doesn't work, but I'll leave this for later https://cloud.mail.ru/public/3PXB/4e5HRYTd8 ===== diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..5165d25d 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1213,6 +1213,40 @@ int FFVideoStream::decode_frame(AVFrame *frame) return 1; } +int FFVideoStream::probe(int64_t pos) +{ + int ret = video_seek(pos); + if( ret < 0 ) return -1; + if( !frame && !(frame=av_frame_alloc()) ) { + fprintf(stderr, "FFVideoStream::probe: av_frame_alloc failed\n"); + return -1; + } + + if (ffmpeg->interlace_from_codec) + return 1; + + ret = read_frame(frame); + if( ret > 0 ) { + //printf("codec interlace: %i \n",frame->interlaced_frame); + //printf("codec tff: %i \n",frame->top_field_first); + + if (!frame->interlaced_frame) + ffmpeg->interlace_from_codec = AV_FIELD_PROGRESSIVE; + if ((frame->interlaced_frame) && (frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_TT; + if ((frame->interlaced_frame) && (!frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_BB; + //printf("Interlace mode from codec: %i\n", ffmpeg->interlace_from_codec); + + } + + if( frame->format == AV_PIX_FMT_NONE || frame->width <= 0 || frame->height <= 0 ) + ret = -1; + + ret = ret > 0 ? 1 : ret < 0 ? -1 : 0; + return ret; +} + int FFVideoStream::load(VFrame *vframe, int64_t pos) { int ret = video_seek(pos); @@ -1221,6 +1255,8 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos) fprintf(stderr, "FFVideoStream::load: av_frame_alloc failed\n"); return -1; } + + int i = MAX_RETRY + pos - curr_pos; int64_t cache_start = 0; while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) { @@ -1391,6 +1427,7 @@ int FFVideoStream::encode(VFrame *vframe) int FFVideoStream::drain() { + return 0; } @@ -1776,6 +1813,7 @@ FFMPEG::FFMPEG(FileBase *file_base) flow = 1; decoding = encoding = 0; has_audio = has_video = 0; + interlace_from_codec = 0; opts = 0; opt_duration = -1; opt_video_filter = 0; @@ -2411,6 +2449,10 @@ int FFMPEG::info(char *text, int len) AVPixelFormat pix_fmt = (AVPixelFormat)st->codecpar->format; const char *pfn = av_get_pix_fmt_name(pix_fmt); report(" pix %s\n", pfn ? pfn : unkn); + int interlace = st->codecpar->field_order; + report(" interlace (container level): %i\n", interlace ? interlace : -1); + int interlace_codec = interlace_from_codec; + report(" interlace (codec level): %i\n", interlace_codec ? interlace_codec : -1); enum AVColorSpace space = st->codecpar->color_space; const char *nm = av_color_space_name(space); report(" color space:%s", nm ? nm : unkn); @@ -3181,6 +3223,33 @@ int FFMPEG::audio_seek(int stream, int64_t pos) return 0; } +int FFMPEG::video_probe(int64_t pos) +{ + int vidx = vstrm_index[0].st_idx; + FFVideoStream *vid = ffvideo[vidx]; + vid->probe(pos); + + int interlace1 = interlace_from_codec; + //printf("interlace from codec: %i\n", interlace1); + + switch (interlace1) + { + case AV_FIELD_TT: + case AV_FIELD_TB: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + case AV_FIELD_BT: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } + +} + + + int FFMPEG::video_seek(int stream, int64_t pos) { int vidx = vstrm_index[stream].st_idx; @@ -3468,7 +3537,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2d(dar); + } + return ffvideo[stream]->aspect_ratio; } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3593,31 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ +// https://ffmpeg.org/doxygen/trunk/structAVCodecParserContext.html +/* reads from demuxer because codec frame not ready */ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace from demux: %i\n", interlace); + + switch (interlace) + { + case AV_FIELD_TT: + case AV_FIELD_TB: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + case AV_FIELD_BT: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } + +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..4f1624ce 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -256,6 +256,7 @@ public: int init_frame(AVFrame *picture); int load(VFrame *vframe, int64_t pos); + int probe(int64_t pos); int video_seek(int64_t pos); int encode(VFrame *vframe); int drain(); @@ -383,6 +384,7 @@ public: double get_initial_timecode(int data_type, int channel, double frame_rate); int audio_seek(int ch, int64_t pos); + int video_probe(int64_t pos); int video_seek(int layer, int64_t pos); int decode(int chn, int64_t pos, double *samples, int len); @@ -434,6 +436,7 @@ public: int decoding, encoding; int has_audio, has_video; + int interlace_from_codec; FFMPEG(FileBase *file_base=0); ~FFMPEG(); @@ -463,6 +466,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int stream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..75825b90 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -326,7 +326,7 @@ int FileFFMPEG::open_file(int rd, int wr) int result = 0; if( ff ) return 1; ff = new FFMPEG(this); - + if( rd ) { result = ff->init_decoder(asset->path); if( !result ) result = ff->open_decoder(); @@ -342,6 +342,11 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); + ff->video_probe(1); + if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->video_probe(1); if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index f245018a..a7c0efab 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4493,11 +4493,14 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { w = 1; h = 1; + double ar; + if(!width || !height) return 1; if( width == 720 && (height == 480 || height == 576) ) { w = 4; h = 3; return 0; // for NTSC and PAL } - double ar = (double)width / height; + + ar = (double)width / height; // square-ish pixels if( EQUIV(ar, 1.0000) ) return 0; if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } @@ -4505,6 +4508,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } + int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -5048,12 +5052,25 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->output_w = width; session->output_h = height; session->frame_rate = framerate; + session->interlace_mode = asset->interlace_mode; // not, asset->actual_width/actual_height asset->width = session->output_w; asset->height = session->output_h; asset->frame_rate = session->frame_rate; + create_aspect_ratio(session->aspect_w, session->aspect_h, session->output_w, session->output_h); + float ar = asset->aspect_ratio; + if (ar) { + printf ("Aspect ratio from asset: %f \n", ar); + if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4; session->aspect_h = 3; } + if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9; } + if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9; } + if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9; } + if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9; } + } + + Track *track = edl->tracks->first; for( Track *next_track=0; track; track=next_track ) { next_track = track->next; ======

1 0

upd: Interlace/aspect autodetect patch (incomplete)
by Andrew Randrianasulu 16 Nov '20

16 Nov '20

Moved this functionality to its own function, still not sure how to call it ... at fileffmpeg::open time https://cloud.mail.ru/public/4x2q/4pmnbbhCw ==== diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..42b91212 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1213,6 +1213,37 @@ int FFVideoStream::decode_frame(AVFrame *frame) return 1; } +int FFVideoStream::probe(int64_t pos) +{ + int ret = video_seek(pos); + if( ret < 0 ) return -1; + if( !frame && !(frame=av_frame_alloc()) ) { + fprintf(stderr, "FFVideoStream::probe: av_frame_alloc failed\n"); + return -1; + } + + ret = read_frame(frame); + if( ret > 0 ) { + //printf("codec interlace: %i \n",frame->interlaced_frame); + //printf("codec tff: %i \n",frame->top_field_first); + + if (!frame->interlaced_frame) + ffmpeg->interlace_from_codec = AV_FIELD_PROGRESSIVE; + if ((frame->interlaced_frame) && (frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_TT; + if ((frame->interlaced_frame) && (!frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_BB; + printf("Interlace mode from codec: %i\n", ffmpeg->interlace_from_codec); + + } + + if( frame->format == AV_PIX_FMT_NONE || frame->width <= 0 || frame->height <= 0 ) + ret = -1; + + ret = ret > 0 ? 1 : ret < 0 ? -1 : 0; + return ret; +} + int FFVideoStream::load(VFrame *vframe, int64_t pos) { int ret = video_seek(pos); @@ -1221,6 +1252,9 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos) fprintf(stderr, "FFVideoStream::load: av_frame_alloc failed\n"); return -1; } + + probe(pos); + int i = MAX_RETRY + pos - curr_pos; int64_t cache_start = 0; while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) { @@ -1391,6 +1425,7 @@ int FFVideoStream::encode(VFrame *vframe) int FFVideoStream::drain() { + return 0; } @@ -2411,6 +2446,8 @@ int FFMPEG::info(char *text, int len) AVPixelFormat pix_fmt = (AVPixelFormat)st->codecpar->format; const char *pfn = av_get_pix_fmt_name(pix_fmt); report(" pix %s\n", pfn ? pfn : unkn); + int interlace = st->codecpar->field_order; + report(" interlace (container level): %i\n", interlace ? interlace : -1); enum AVColorSpace space = st->codecpar->color_space; const char *nm = av_color_space_name(space); report(" color space:%s", nm ? nm : unkn); @@ -3468,7 +3505,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2d(dar); + } + return ffvideo[stream]->aspect_ratio; } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3561,31 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ +// https://ffmpeg.org/doxygen/trunk/structAVCodecParserContext.html +/* reads from demuxer because codec frame not ready */ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace from demux: %i\n", interlace); + + switch (interlace) + { + case AV_FIELD_TT: + case AV_FIELD_TB: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + case AV_FIELD_BT: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } + +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..a34a9d81 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -256,6 +256,7 @@ public: int init_frame(AVFrame *picture); int load(VFrame *vframe, int64_t pos); + int probe(int64_t pos); int video_seek(int64_t pos); int encode(VFrame *vframe); int drain(); @@ -434,6 +435,7 @@ public: int decoding, encoding; int has_audio, has_video; + int interlace_from_codec; FFMPEG(FileBase *file_base=0); ~FFMPEG(); @@ -463,6 +465,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int stream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..f30e1b8a 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -342,6 +342,10 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); + /* if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->interlace_from_codec; */ if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index f245018a..a7c0efab 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4493,11 +4493,14 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { w = 1; h = 1; + double ar; + if(!width || !height) return 1; if( width == 720 && (height == 480 || height == 576) ) { w = 4; h = 3; return 0; // for NTSC and PAL } - double ar = (double)width / height; + + ar = (double)width / height; // square-ish pixels if( EQUIV(ar, 1.0000) ) return 0; if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } @@ -4505,6 +4508,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } + int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -5048,12 +5052,25 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->output_w = width; session->output_h = height; session->frame_rate = framerate; + session->interlace_mode = asset->interlace_mode; // not, asset->actual_width/actual_height asset->width = session->output_w; asset->height = session->output_h; asset->frame_rate = session->frame_rate; + create_aspect_ratio(session->aspect_w, session->aspect_h, session->output_w, session->output_h); + float ar = asset->aspect_ratio; + if (ar) { + printf ("Aspect ratio from asset: %f \n", ar); + if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4; session->aspect_h = 3; } + if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9; } + if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9; } + if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9; } + if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9; } + } + + Track *track = edl->tracks->first; for( Track *next_track=0; track; track=next_track ) { next_track = track->next; =====

1 0

Interlace/aspect autodetect patch (incomplete)
by Andrew Randrianasulu 16 Nov '20

16 Nov '20

So, I found way to get interlace info out of codec, but sadly only at FFVideoStream::load() time (so, it still just print info to terminal, and do not use it in asset/project) Unfortunately at FileFFMPEG::open_file time this functon still not called yet. ===== diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..55e94e4b 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1226,6 +1226,17 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos) while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) { ret = read_frame(frame); if( ret > 0 ) { + //printf("codec interlace: %i \n",frame->interlaced_frame); + //printf("codec tff: %i \n",frame->top_field_first); + + if (!frame->interlaced_frame) + ffmpeg->interlace_from_codec = AV_FIELD_PROGRESSIVE; + if ((frame->interlaced_frame) && (frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_TT; + if ((frame->interlaced_frame) && (!frame->top_field_first)) + ffmpeg->interlace_from_codec = AV_FIELD_BB; + printf("Interlace mode from codec: %i\n", ffmpeg->interlace_from_codec); + if( frame->key_frame && seeking < 0 ) { int use_cache = ffmpeg->get_use_cache(); if( use_cache < 0 ) { @@ -2411,6 +2422,8 @@ int FFMPEG::info(char *text, int len) AVPixelFormat pix_fmt = (AVPixelFormat)st->codecpar->format; const char *pfn = av_get_pix_fmt_name(pix_fmt); report(" pix %s\n", pfn ? pfn : unkn); + int interlace = st->codecpar->field_order; + report(" interlace (container level): %i\n", interlace ? interlace : -1); enum AVColorSpace space = st->codecpar->color_space; const char *nm = av_color_space_name(space); report(" color space:%s", nm ? nm : unkn); @@ -3468,7 +3481,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2d(dar); + } + return ffvideo[stream]->aspect_ratio; } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3537,31 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ +// https://ffmpeg.org/doxygen/trunk/structAVCodecParserContext.html +/* reads from demuxer because codec frame not ready */ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace from demux: %i\n", interlace); + + switch (interlace) + { + case AV_FIELD_TT: + case AV_FIELD_TB: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + case AV_FIELD_BT: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } + +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..53efca66 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -434,6 +434,7 @@ public: int decoding, encoding; int has_audio, has_video; + int interlace_from_codec; FFMPEG(FileBase *file_base=0); ~FFMPEG(); @@ -463,6 +464,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int stream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..f30e1b8a 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -342,6 +342,10 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); + /* if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->interlace_from_codec; */ if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index f245018a..a7c0efab 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4493,11 +4493,14 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { w = 1; h = 1; + double ar; + if(!width || !height) return 1; if( width == 720 && (height == 480 || height == 576) ) { w = 4; h = 3; return 0; // for NTSC and PAL } - double ar = (double)width / height; + + ar = (double)width / height; // square-ish pixels if( EQUIV(ar, 1.0000) ) return 0; if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } @@ -4505,6 +4508,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } + int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -5048,12 +5052,25 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->output_w = width; session->output_h = height; session->frame_rate = framerate; + session->interlace_mode = asset->interlace_mode; // not, asset->actual_width/actual_height asset->width = session->output_w; asset->height = session->output_h; asset->frame_rate = session->frame_rate; + create_aspect_ratio(session->aspect_w, session->aspect_h, session->output_w, session->output_h); + float ar = asset->aspect_ratio; + if (ar) { + printf ("Aspect ratio from asset: %f \n", ar); + if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4; session->aspect_h = 3; } + if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9; } + if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9; } + if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9; } + if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9; } + } + + Track *track = edl->tracks->first; for( Track *next_track=0; track; track=next_track ) { next_track = track->next; ----- file also at: https://cloud.mail.ru/public/5q3R/4rtiZGREH

1 0

HDV formats patch
by Andrew Randrianasulu 15 Nov '20

15 Nov '20

For cinelerra/defaultformats.h I de-capitalized "I" in presets, but I'm not sure about overall aesthetics of "P" vs "p" or how I added "(HDV)" to some presets (because I think those 720p presets can be used outside of HDV material?) Terje, can you try to pull cinGG sources from git, apply my patch (git apply PATCH from source tree) and build with "--with-single-user", so there will be no danger to your Cin isntallation and see if patch actually gives workable settings for your real footage? From dialogs it seems Aspect Ratio at the bottom of format window IS Screen/Display aspect ration, and W/H ratio is about non-square pixels. But I wonder how it supposed to work for rendering back into HDV? If your pipeline set to 1440x1080, and you encode just with special flag set - all movements and graphics and text and masked effects you added must be somewhat scaled horizontally up and down? (because if Compositor shows 1920x1080 image, and you draw nice square with Sketcher there - how those pixels will be drawn on top of project size sized frame? Or you must have special overlay track set to 1920x1080 where you draw, and then just let Cin mix two?) NOTE: I don't think this will adds autodetect-on-load but at least having correct profiles somewhere might be 0.2 step in this direction.

3 23

Getting field_order in dv demuxer early?
by Andrew Randrianasulu 14 Nov '20

14 Nov '20

Hello, all! I was trying to get field order autodetection working in CinelerraGG (our developer sadly died, so I can't ask him anymore ...) I get field_order like this: int FFMPEG::ff_interlace(int stream) { /* reads from demuxer because codec frame not ready */ int interlace = ffvideo[stream]->st->codecpar->field_order; printf("interlace: %i\n", interlace); switch (interlace) { case AV_FIELD_TT: return ILACE_MODE_TOP_FIRST; case AV_FIELD_BB: return ILACE_MODE_BOTTOM_FIRST; case AV_FIELD_PROGRESSIVE: return ILACE_MODE_NOTINTERLACED; default: return ILACE_MODE_UNDETECTED; } } Unfortunately, this only work for mpegts streams and not for, say, dv. I tried to add some code in libavformat/dv.c, and while it sort-of working, it apparently doesn't work early enough (at stream probe time?) in cinelerra/cinelerra-5.1/thirdparty/ffmpeg-4.3/libavformat/dv.c in function dv_extract_video_info() I added those lines (logic might be wrong, but I can fix it later, I used libavcodec/dvdec.c as example): if (c->sys->height == 720) { par->field_order = AV_FIELD_PROGRESSIVE;} else if (c->sys->height == 1080) { int ilaced = 1; int tff = (vsc_pack[3] & 0x40) == 0x40; par->field_order = tff ? AV_FIELD_TT : 0; } else { int ilaced = (vsc_pack[3] & 0x10) == 0x10; int tff = !(vsc_pack[3] & 0x40) == 0x40; par->field_order = tff ? 0 : AV_FIELD_BB; } //printf("Field order: %i \n", par->field_order); It prints 'field order: 3" for usual pal DV example, but ffprobe (from where I get my logic for extracting field_order) still says: /dev/shm/cinelerra/cinelerra-5.1/thirdparty/ffmpeg-4.3/ffprobe -show_streams /dev/shm/qt_dv_pal_test.mov Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Field order: 3 Input #0, mov,mp4,m4a,3gp,3g2,mj2, from '/dev/shm/qt_dv_pal_test.mov': Metadata: creation_time : 2002-10-04T18:46:28.000000Z Duration: 00:00:04.45, start: 0.000000, bitrate: 57948 kb/s Stream #0:0(eng): Video: dvvideo (dvcp / 0x70637664), yuv420p, 720x576 [SAR 16:15 DAR 4:3], 28800 kb/s, 25 fps, 25 tbr, 600 tbn, 25 tbc (default) Metadata: creation_time : 2002-10-04T18:46:28.000000Z handler_name : Apple Video Media Handler encoder : DV - PAL Stream #0:1(eng): Audio: pcm_s16le (dvca / 0x61637664), 48000 Hz, 2 channels, s16, 1536 kb/s (default) Metadata: creation_time : 2002-10-04T18:46:28.000000Z handler_name : Apple Sound Media Handler [STREAM] index=0 codec_name=dvvideo codec_long_name=DV (Digital Video) profile=unknown codec_type=video codec_time_base=1/25 codec_tag_string=dvcp codec_tag=0x70637664 width=720 height=576 coded_width=720 coded_height=576 closed_captions=0 has_b_frames=0 sample_aspect_ratio=16:15 display_aspect_ratio=4:3 pix_fmt=yuv420p level=-99 color_range=unknown color_space=unknown color_transfer=unknown color_primaries=unknown chroma_location=topleft field_order=unknown timecode=N/A [a lot more skiped] I tried to add same logic into dv_read_header(), but dv_extract_pack(frame, dv_video_control); wants 'frame' and I have no idea from where to plug it. Idea about putting this in header reading code come from libavformat/yuv4mpegdec.c Any ideas?

2 2

Even more updated interlace/aspect ratio autodetection patch
by Andrew Randrianasulu 14 Nov '20

14 Nov '20

It basically forces project to take first asset's interlace mode, but of course you still can change settings manually diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..9eabe9bd 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -3468,7 +3468,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2d(dar); + } + return ffvideo[stream]->aspect_ratio; } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3524,25 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace: %i\n", interlace); + switch (interlace) + { + case AV_FIELD_TT: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..d4bef2fd 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -463,6 +463,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int sream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..f8567adf 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -342,6 +342,9 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index f245018a..a7c0efab 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4493,11 +4493,14 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { w = 1; h = 1; + double ar; + if(!width || !height) return 1; if( width == 720 && (height == 480 || height == 576) ) { w = 4; h = 3; return 0; // for NTSC and PAL } - double ar = (double)width / height; + + ar = (double)width / height; // square-ish pixels if( EQUIV(ar, 1.0000) ) return 0; if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } @@ -4505,6 +4508,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } + int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -5048,12 +5052,25 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->output_w = width; session->output_h = height; session->frame_rate = framerate; + session->interlace_mode = asset->interlace_mode; // not, asset->actual_width/actual_height asset->width = session->output_w; asset->height = session->output_h; asset->frame_rate = session->frame_rate; + create_aspect_ratio(session->aspect_w, session->aspect_h, session->output_w, session->output_h); + float ar = asset->aspect_ratio; + if (ar) { + printf ("Aspect ratio from asset: %f \n", ar); + if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4; session->aspect_h = 3; } + if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9; } + if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9; } + if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9; } + if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9; } + } + + Track *track = edl->tracks->first; for( Track *next_track=0; track; track=next_track ) { next_track = track->next;

1 0

slightly better interlace/aspect ratio autodetect patch
by Andrew Randrianasulu 14 Nov '20

14 Nov '20

This one sets things correctly (?) for Terje's HDV file, but interlace auto-setting still not setting _project's_ interlace mode It still prints a lot of debug lines diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..9eabe9bd 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -3468,7 +3468,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2d(dar); + } + return ffvideo[stream]->aspect_ratio; } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3524,25 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace: %i\n", interlace); + switch (interlace) + { + case AV_FIELD_TT: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..d4bef2fd 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -463,6 +463,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int sream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..f8567adf 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -342,6 +342,9 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index f245018a..cac84d10 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4493,11 +4493,14 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { w = 1; h = 1; + double ar; + if(!width || !height) return 1; if( width == 720 && (height == 480 || height == 576) ) { w = 4; h = 3; return 0; // for NTSC and PAL } - double ar = (double)width / height; + + ar = (double)width / height; // square-ish pixels if( EQUIV(ar, 1.0000) ) return 0; if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } @@ -4505,6 +4508,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } + int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -5052,8 +5056,20 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra asset->width = session->output_w; asset->height = session->output_h; asset->frame_rate = session->frame_rate; + create_aspect_ratio(session->aspect_w, session->aspect_h, session->output_w, session->output_h); + float ar = asset->aspect_ratio; + if (ar) { + printf ("Aspect ratio from asset: %f \n", ar); + if( EQUIV(ar, 1.3333) ) { session->aspect_w = 4; session->aspect_h = 3; } + if( EQUIV(ar, 1.7777) ) { session->aspect_w = 16; session->aspect_h = 9; } + if( EQUIV(ar, 2.1111) ) { session->aspect_w = 19; session->aspect_h = 9; } + if( EQUIV(ar, 2.2222) ) { session->aspect_w = 20; session->aspect_h = 9; } + if( EQUIV(ar, 2.3333) ) { session->aspect_w = 21; session->aspect_h = 9; } + } + + Track *track = edl->tracks->first; for( Track *next_track=0; track; track=next_track ) { next_track = track->next;

1 0

Partial patch for detecting SAR/DAR and interlace.
by Andrew Randrianasulu 14 Nov '20

14 Nov '20

Aspect ratio detection still doesn't work, but interlace detection seems to work for mpeg2 files (but not for dv in avi) it prints SAR/DAR to terminal At The Moment: sample_aspect_ratio, 1.333333 display_aspect_ratio, 1.777778 interlace: 2 for HDV 1080i file and interlace: 1 sample_aspect_ratio, 1.000000 display_aspect_ratio, 1.777778 for progressive 1080p25 mpeg2 file diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 97b6698a..0264516a 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -3468,7 +3468,22 @@ int FFMPEG::ff_coded_height(int stream) float FFMPEG::ff_aspect_ratio(int stream) { - return ffvideo[stream]->aspect_ratio; + //return ffvideo[stream]->aspect_ratio; + AVFormatContext *fmt_ctx = ffvideo[stream]->fmt_ctx; + AVStream *strm = ffvideo[stream]->st; + AVCodecParameters *par = ffvideo[stream]->st->codecpar; + AVRational dar; + AVRational sar = av_guess_sample_aspect_ratio(fmt_ctx, strm, NULL); + if (sar.num) { + printf("sample_aspect_ratio, %f \n", av_q2d(sar)); + av_reduce(&dar.num, &dar.den, + par->width * sar.num, + par->height * sar.den, + 1024*1024); + printf("display_aspect_ratio, %f \n", av_q2d(dar)); + return av_q2intfloat(dar); + } + } const char* FFMPEG::ff_video_codec(int stream) @@ -3509,6 +3524,25 @@ int FFMPEG::ff_video_mpeg_color_range(int stream) return ffvideo[stream]->st->codecpar->color_range == AVCOL_RANGE_MPEG ? 1 : 0; } +int FFMPEG::ff_interlace(int stream) +{ + int interlace = ffvideo[stream]->st->codecpar->field_order; + printf("interlace: %i\n", interlace); + switch (interlace) + { + case AV_FIELD_TT: + return ILACE_MODE_TOP_FIRST; + case AV_FIELD_BB: + return ILACE_MODE_BOTTOM_FIRST; + case AV_FIELD_PROGRESSIVE: + return ILACE_MODE_NOTINTERLACED; + default: + return ILACE_MODE_UNDETECTED; + } +} + + + int FFMPEG::ff_cpus() { return !file_base ? 1 : file_base->file->cpus; diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h index 2e1f201f..d4bef2fd 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.h +++ b/cinelerra-5.1/cinelerra/ffmpeg.h @@ -463,6 +463,7 @@ public: float ff_aspect_ratio(int stream); int ff_color_range(int stream); int ff_color_space(int stream); + int ff_interlace(int sream); double ff_frame_rate(int stream); const char *ff_video_codec(int stream); int64_t ff_video_frames(int stream); diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index ff206b10..48c1ca7d 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -342,6 +342,8 @@ int FileFFMPEG::open_file(int rd, int wr) int video_layers = ff->ff_total_video_layers(); if( video_layers > 0 ) { asset->video_data = 1; + asset->aspect_ratio = ff->ff_aspect_ratio(0); + if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0);

1 0

Re: [Cin] actually, added few more formats to theme.C
by Andrew Randrianasulu 13 Nov '20

13 Nov '20

В сообщении от Saturday 31 October 2020 19:21:05 вы написали: > Hi, > > I chime in here, because some time ago I reported what I think may be a > related issue #0000491 on MantisBT: > > 1) HDV format not auto-detected correctly and > 2) HDV formats not available among presets Well, I added two HDV presets, as I udnerstand them .. but I can be wrong, or VERY wrong! diff --git a/cinelerra-5.1/cinelerra/defaultformats.h b/cinelerra-5.1/cinelerra/defaultformats.h index 61bd2165..1fe71282 100644 --- a/cinelerra-5.1/cinelerra/defaultformats.h +++ b/cinelerra-5.1/cinelerra/defaultformats.h @@ -39,14 +39,34 @@ struct formatpresets }; static struct formatpresets format_presets[] = { - { N_("1080P/60"), 2, 2, 48000, 1, 1, 60000.0 / 1001, + { N_("1080P/60"), 2, 2, 48000, 1, 1, 60, + 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("1080P/59.94"), 2, 2, 48000, 1, 1, 60000.0 / 1001, + 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("1080P/30"), 6, 6, 48000, 1, 1, 30, + 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("1080P/29.97"), 6, 6, 48000, 1, 1, 30000.0 / 1001, 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, { N_("1080P/24"), 6, 6, 48000, 1, 1, 24, 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, - { N_("1080I"), 2, 2, 48000, 1, 1, 30000.0 / 1001, + { N_("1080P/23.976"), 6, 6, 48000, 1, 1, 24000.0 / 1001, + 1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("1080I/29.97"), 2, 2, 48000, 1, 1, 30000.0 / 1001, 1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 }, + { N_("HDV 1080i/29.97"), 2, 2, 48000, 1, 1, 30000.0 / 1001, + 1440,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 }, + { N_("HDV 1080i/25"), 2, 2, 48000, 1, 1, 25, + 1440,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 }, { N_("720P/60"), 2, 2, 48000, 1, 1, 60000.0 / 1001, 1280,720, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("720P/50"), 2, 2, 48000, 1, 1, 50, + 1280,720, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("720P/29.97"), 2, 2, 48000, 1, 1, 30000.0 / 1001, + 1280,720, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("720P/25"), 2, 2, 48000, 1, 1, 25, + 1280,720, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, + { N_("720P/23.976"), 2, 2, 48000, 1, 1, 24000.0 / 1001, + 1280,720, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 }, { N_("PAL 576I - DV(D)"), 2, 2, 48000, 1, 1, 25, 720,576, 4,3, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 }, { N_("NTSC 480P - DV(D)"), 2, 2, 48000, 1, 1, 60000.0 / 1001, I added plenty of 1080p formats because this line in wiki: https://en.wikipedia.org/wiki/1080p24 "DVB also supports 1080p encoded at ATSC frame rates of 23.976, 24, 29.97, 30, 59.94 and 60.[9][10]" > > https://www.cinelerra-gg.org/bugtracker/view.php?id=491 > > > Terje J. Hanssen > > > Den 31.10.2020 15:30, skrev Andrew Randrianasulu via Cin: > > В сообщении от Saturday 31 October 2020 16:06:48 Pierre autourduglobe via Cin написал(а): > >> Maybe the HDV (1440x1080)? > > Added this too, but in general there is something about pixel aspect ratioI don't understand: > > > > https://en.wikipedia.org/wiki/Pixel_aspect_ratio > > > > 1440x1080i will come as exactly this stream from mpeg2 decoder. But for display/processing it must be stretched 1.33 horizontally? > > > > https://en.wikipedia.org/wiki/HDV > > > > Pixel aspect ratio 1.0 (720p) 1.33 (1080i) > > > > Is this specific kind of aspect ration handled in CinGG? > > > > I see recent (this year) discussion on cin ML, but ... > > > > https://www.mail-archive.com/cin%40lists.cinelerra-gg.org/msg01473.html > > > > "So it changes DAR (Display Aspect Ratio) and/or PAR (Pixel Aspect Ratio) for some types of container/codec: pixel may not be square (1:1)." > > > > so, when it does AND and when it does OR ? :} Because they not the same .... > > > >> Pierre > >> > >> > >> Le 20-10-31 à 07 h 40, Andrew Randrianasulu via Cin a écrit : > >>> Not sure how many of them actually useful (CIF might be, and of course my own 1440x900 :-)), but this list already requires scrolling :} > >>> > >>> diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C > >>> index d89c789f..07cfb1d2 100644 > >>> --- a/cinelerra-5.1/cinelerra/theme.C > >>> +++ b/cinelerra-5.1/cinelerra/theme.C > >>> @@ -274,6 +274,7 @@ void Theme::build_menus() > >>> aspect_ratios.append(new BC_ListBoxItem("3:2")); > >>> aspect_ratios.append(new BC_ListBoxItem("4:3")); > >>> aspect_ratios.append(new BC_ListBoxItem("16:9")); > >>> + aspect_ratios.append(new BC_ListBoxItem("16:10")); > >>> aspect_ratios.append(new BC_ListBoxItem("2.10:1")); > >>> aspect_ratios.append(new BC_ListBoxItem("2.20:1")); > >>> aspect_ratios.append(new BC_ListBoxItem("2.25:1")); > >>> @@ -283,9 +284,11 @@ void Theme::build_menus() > >>> > >>> frame_sizes.append(new BC_ListBoxItem("128x96 ")); > >>> frame_sizes.append(new BC_ListBoxItem("160x120 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("240x160 HQVGA")); > >>> frame_sizes.append(new BC_ListBoxItem("320x240 ")); > >>> frame_sizes.append(new BC_ListBoxItem("360x240 ")); > >>> - frame_sizes.append(new BC_ListBoxItem("400x300 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("384x288 CIF")); > >>> + frame_sizes.append(new BC_ListBoxItem("400x300 qSVGA")); > >>> frame_sizes.append(new BC_ListBoxItem("640x360 nHD")); > >>> frame_sizes.append(new BC_ListBoxItem("640x400 ")); > >>> frame_sizes.append(new BC_ListBoxItem("640x480 VGA")); > >>> @@ -299,19 +302,31 @@ void Theme::build_menus() > >>> frame_sizes.append(new BC_ListBoxItem("1024x576 ")); > >>> frame_sizes.append(new BC_ListBoxItem("1024x768 XGA")); > >>> frame_sizes.append(new BC_ListBoxItem("1152x648 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("1152x768 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("1152x864 XGA+")); > >>> frame_sizes.append(new BC_ListBoxItem("1280x720 HD")); > >>> + frame_sizes.append(new BC_ListBoxItem("1280x800 ")); > >>> frame_sizes.append(new BC_ListBoxItem("1280x1024 SXGA")); > >>> frame_sizes.append(new BC_ListBoxItem("1366x768 WXGA")); > >>> + frame_sizes.append(new BC_ListBoxItem("1440x900 WXGA+")); > >>> frame_sizes.append(new BC_ListBoxItem("1600x900 HD+")); > >>> frame_sizes.append(new BC_ListBoxItem("1600x1200 UXGA")); > >>> frame_sizes.append(new BC_ListBoxItem("1920x1080 Full HD")); > >>> + frame_sizes.append(new BC_ListBoxItem("1920x1280 FHD+")); > >>> + frame_sizes.append(new BC_ListBoxItem("2048x1080 DCI 2K")); > >>> frame_sizes.append(new BC_ListBoxItem("2048x1152 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("2048x1536 QXGA")); > >>> + frame_sizes.append(new BC_ListBoxItem("2160x1440 ")); > >>> frame_sizes.append(new BC_ListBoxItem("2304x1296 ")); > >>> - frame_sizes.append(new BC_ListBoxItem("2560x1440 QHD")); > >>> + frame_sizes.append(new BC_ListBoxItem("2560x1080 UW-FHD")); > >>> + frame_sizes.append(new BC_ListBoxItem("2560x1440 WQHD")); > >>> frame_sizes.append(new BC_ListBoxItem("2880x1620 ")); > >>> - frame_sizes.append(new BC_ListBoxItem("3200x1800 QHD+")); > >>> + frame_sizes.append(new BC_ListBoxItem("3200x1800 WQXGA+")); > >>> + frame_sizes.append(new BC_ListBoxItem("3440x1440 Ultra-Wide QHD")); > >>> frame_sizes.append(new BC_ListBoxItem("3520x1980 ")); > >>> + frame_sizes.append(new BC_ListBoxItem("3840x1600 UW4K")); > >>> frame_sizes.append(new BC_ListBoxItem("3840x2160 4K UHD")); > >>> + frame_sizes.append(new BC_ListBoxItem("4096x2160 DCI 4K")); > >>> frame_sizes.append(new BC_ListBoxItem("4096x2304 Full 4K UHD")); > >>> frame_sizes.append(new BC_ListBoxItem("4480x2520 ")); > >>> frame_sizes.append(new BC_ListBoxItem("5120x2880 5K UHD")); > >>> > >>> ---- > >>> > >>> list of course from https://en.wikipedia.org/wiki/List_of_common_resolutions > >>> > >>> > > > > > >

3 13

UPD: Re: DNxHR presets
by Andrew Randrianasulu 12 Nov '20

12 Nov '20

I also tested _lb and _sq presets. They also seems to accept only yuv422p Should I add some remark all those are for using with progressive video? (in file itself, so user will see it in window, othervise reason why it fails to render may be hidden, if user start Cin from menu) ---------- Пересланное сообщение ---------- Тема: Re: [Cin] DNxHR presets Дата: Понедельник 09 ноября 2020 Отправитель: Andrew Randrianasulu <randrianasulu(a)gmail.com> Получатель: cin(a)lists.cinelerra-gg.org I tried to modify those presets so they show/select right pixel format, but for some reason file path: /dev/shm/DNxHR-yuv422-8bit.mov 435864233 bytes info: format: mov,mp4,m4a,3gp,3g2,mj2 1 video stream vid0 (0), id 0x000063: video1 dnxhd 1920x1080 30.00 pix yuv422p is basically same size as file path: /dev/shm/DNxHR-yuv422.mov 435864233 bytes info: format: mov,mp4,m4a,3gp,3g2,mj2 1 video stream vid0 (0), id 0x000063: video1 dnxhd 1920x1080 30.00 pix yuv422p10le color space:bt709/ range:tv 472+0 frms 15.73 secs 0:00:15.73 (both play fast/realtime on my machine, as opposed to DNxHR_444) -------------------------------------------------------

3 14