From 7d4d1b562c760c86973180ae94ecc3f690107d2e Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Wed, 10 Feb 2010 23:48:21 -0800 Subject: [PATCH] Revise Hz->fps in profiles and add more ATSC profiles. --- profiles/atsc_1080i_50 | 2 +- profiles/atsc_1080i_5994 | 10 ++++++++++ profiles/atsc_1080i_60 | 6 +++--- profiles/atsc_1080p_2398 | 2 +- profiles/atsc_1080p_24 | 2 +- profiles/atsc_1080p_25 | 2 +- profiles/atsc_1080p_2997 | 2 +- profiles/atsc_1080p_30 | 2 +- profiles/atsc_720p_2398 | 11 +++++++++++ profiles/atsc_720p_24 | 11 +++++++++++ profiles/atsc_720p_25 | 11 +++++++++++ profiles/atsc_720p_2997 | 11 +++++++++++ profiles/atsc_720p_30 | 6 +++--- profiles/atsc_720p_50 | 11 +++++++++++ profiles/atsc_720p_5994 | 11 +++++++++++ profiles/atsc_720p_60 | 11 +++++++++++ profiles/hdv_1080_25p | 2 +- profiles/hdv_1080_30p | 2 +- profiles/hdv_1080_50i | 2 +- profiles/hdv_1080_60i | 2 +- profiles/hdv_720_25p | 2 +- profiles/hdv_720_30p | 2 +- profiles/hdv_720_50p | 2 +- profiles/hdv_720_60p | 2 +- profiles/qcif_15 | 2 +- profiles/quarter_15 | 2 +- profiles/quarter_ntsc | 2 +- profiles/sdi_486i_5994 | 10 ++++++++++ src/framework/mlt_profile.c | 1 + 29 files changed, 121 insertions(+), 23 deletions(-) create mode 100644 profiles/atsc_1080i_5994 create mode 100644 profiles/atsc_720p_2398 create mode 100644 profiles/atsc_720p_24 create mode 100644 profiles/atsc_720p_25 create mode 100644 profiles/atsc_720p_2997 create mode 100644 profiles/atsc_720p_50 create mode 100644 profiles/atsc_720p_5994 create mode 100644 profiles/atsc_720p_60 create mode 100644 profiles/sdi_486i_5994 diff --git a/profiles/atsc_1080i_50 b/profiles/atsc_1080i_50 index 6157cd32..6fffa9c7 100644 --- a/profiles/atsc_1080i_50 +++ b/profiles/atsc_1080i_50 @@ -1,4 +1,4 @@ -description=HD 1080i 50Hz +description=HD 1080i 25 fps frame_rate_num=25 frame_rate_den=1 width=1920 diff --git a/profiles/atsc_1080i_5994 b/profiles/atsc_1080i_5994 new file mode 100644 index 00000000..c7a98db7 --- /dev/null +++ b/profiles/atsc_1080i_5994 @@ -0,0 +1,10 @@ +description=HD 1080i 29.97 fps +frame_rate_num=30000 +frame_rate_den=1001 +width=1920 +height=1080 +progressive=0 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 diff --git a/profiles/atsc_1080i_60 b/profiles/atsc_1080i_60 index 473c1cdc..0d75b875 100644 --- a/profiles/atsc_1080i_60 +++ b/profiles/atsc_1080i_60 @@ -1,6 +1,6 @@ -description=HD 1080i 60Hz -frame_rate_num=30000 -frame_rate_den=1001 +description=HD 1080i 30 fps +frame_rate_num=30 +frame_rate_den=1 width=1920 height=1080 progressive=0 diff --git a/profiles/atsc_1080p_2398 b/profiles/atsc_1080p_2398 index 78bab246..76814ba9 100644 --- a/profiles/atsc_1080p_2398 +++ b/profiles/atsc_1080p_2398 @@ -1,4 +1,4 @@ -description=HD 1080p 23.98Hz +description=HD 1080p 23.98 fps frame_rate_num=24000 frame_rate_den=1001 width=1920 diff --git a/profiles/atsc_1080p_24 b/profiles/atsc_1080p_24 index b7dc9464..e722b595 100644 --- a/profiles/atsc_1080p_24 +++ b/profiles/atsc_1080p_24 @@ -1,4 +1,4 @@ -description=HD 1080p 24Hz +description=HD 1080p 24 fps frame_rate_num=24 frame_rate_den=1 width=1920 diff --git a/profiles/atsc_1080p_25 b/profiles/atsc_1080p_25 index 8ddb6f62..37b2d6dd 100644 --- a/profiles/atsc_1080p_25 +++ b/profiles/atsc_1080p_25 @@ -1,4 +1,4 @@ -description=HD 1080p 25Hz +description=HD 1080p 25 fps frame_rate_num=25 frame_rate_den=1 width=1920 diff --git a/profiles/atsc_1080p_2997 b/profiles/atsc_1080p_2997 index e3ff6d2f..19e7fc77 100644 --- a/profiles/atsc_1080p_2997 +++ b/profiles/atsc_1080p_2997 @@ -1,4 +1,4 @@ -description=HD 1080p 29.97Hz +description=HD 1080p 29.97 fps frame_rate_num=30000 frame_rate_den=1001 width=1920 diff --git a/profiles/atsc_1080p_30 b/profiles/atsc_1080p_30 index 0b0109ff..20a53319 100644 --- a/profiles/atsc_1080p_30 +++ b/profiles/atsc_1080p_30 @@ -1,4 +1,4 @@ -description=HD 1080p 30Hz +description=HD 1080p 30 fps frame_rate_num=30 frame_rate_den=1 width=1920 diff --git a/profiles/atsc_720p_2398 b/profiles/atsc_720p_2398 new file mode 100644 index 00000000..7e4c2bb3 --- /dev/null +++ b/profiles/atsc_720p_2398 @@ -0,0 +1,11 @@ +description=HD 720p 23.98 fps +frame_rate_num=24000 +frame_rate_den=1001 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_24 b/profiles/atsc_720p_24 new file mode 100644 index 00000000..51abb613 --- /dev/null +++ b/profiles/atsc_720p_24 @@ -0,0 +1,11 @@ +description=HD 720p 24 fps +frame_rate_num=24 +frame_rate_den=1 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_25 b/profiles/atsc_720p_25 new file mode 100644 index 00000000..2978ac46 --- /dev/null +++ b/profiles/atsc_720p_25 @@ -0,0 +1,11 @@ +description=HD 720p 25 fps +frame_rate_num=25 +frame_rate_den=1 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_2997 b/profiles/atsc_720p_2997 new file mode 100644 index 00000000..47a91714 --- /dev/null +++ b/profiles/atsc_720p_2997 @@ -0,0 +1,11 @@ +description=HD 720p 29.97 fps +frame_rate_num=30000 +frame_rate_den=1001 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_30 b/profiles/atsc_720p_30 index fea1d060..5c68e8e6 100644 --- a/profiles/atsc_720p_30 +++ b/profiles/atsc_720p_30 @@ -1,6 +1,6 @@ -description=HD 720p 29.97Hz -frame_rate_num=30000 -frame_rate_den=1001 +description=HD 720p 30 fps +frame_rate_num=30 +frame_rate_den=1 width=1280 height=720 progressive=1 diff --git a/profiles/atsc_720p_50 b/profiles/atsc_720p_50 new file mode 100644 index 00000000..a3ffdf37 --- /dev/null +++ b/profiles/atsc_720p_50 @@ -0,0 +1,11 @@ +description=HD 720p 50 fps +frame_rate_num=50 +frame_rate_den=1 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_5994 b/profiles/atsc_720p_5994 new file mode 100644 index 00000000..c21ec317 --- /dev/null +++ b/profiles/atsc_720p_5994 @@ -0,0 +1,11 @@ +description=HD 720p 59.94 fps +frame_rate_num=60000 +frame_rate_den=1001 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/atsc_720p_60 b/profiles/atsc_720p_60 new file mode 100644 index 00000000..93ff178d --- /dev/null +++ b/profiles/atsc_720p_60 @@ -0,0 +1,11 @@ +description=HD 720p 60 fps +frame_rate_num=60 +frame_rate_den=1 +width=1280 +height=720 +progressive=1 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=16 +display_aspect_den=9 + diff --git a/profiles/hdv_1080_25p b/profiles/hdv_1080_25p index 263f397c..e8bcd5cc 100644 --- a/profiles/hdv_1080_25p +++ b/profiles/hdv_1080_25p @@ -1,4 +1,4 @@ -description=HDV 1440x1080 25p +description=HDV 1440x1080p 25 fps frame_rate_num=25 frame_rate_den=1 width=1440 diff --git a/profiles/hdv_1080_30p b/profiles/hdv_1080_30p index 8783842c..4ac4f2f5 100644 --- a/profiles/hdv_1080_30p +++ b/profiles/hdv_1080_30p @@ -1,4 +1,4 @@ -description=HDV 1440x1080 30p +description=HDV 1440x1080p 29.97 fps frame_rate_num=30000 frame_rate_den=1001 width=1440 diff --git a/profiles/hdv_1080_50i b/profiles/hdv_1080_50i index 3bc8b13a..95299db2 100644 --- a/profiles/hdv_1080_50i +++ b/profiles/hdv_1080_50i @@ -1,4 +1,4 @@ -description=HDV 1440x1080 50i +description=HDV 1440x1080i 25 fps frame_rate_num=25 frame_rate_den=1 width=1440 diff --git a/profiles/hdv_1080_60i b/profiles/hdv_1080_60i index bdacf8b6..83121d6d 100644 --- a/profiles/hdv_1080_60i +++ b/profiles/hdv_1080_60i @@ -1,4 +1,4 @@ -description=HDV 1440x1080 60i +description=HDV 1440x1080i 29.97 fps frame_rate_num=30000 frame_rate_den=1001 width=1440 diff --git a/profiles/hdv_720_25p b/profiles/hdv_720_25p index 76e91ffc..1fac5f84 100644 --- a/profiles/hdv_720_25p +++ b/profiles/hdv_720_25p @@ -1,4 +1,4 @@ -description=HD 720p 25Hz +description=HD 720p 25 fps frame_rate_num=25 frame_rate_den=1 width=1280 diff --git a/profiles/hdv_720_30p b/profiles/hdv_720_30p index fea1d060..6490937c 100644 --- a/profiles/hdv_720_30p +++ b/profiles/hdv_720_30p @@ -1,4 +1,4 @@ -description=HD 720p 29.97Hz +description=HD 720p 29.97 fps frame_rate_num=30000 frame_rate_den=1001 width=1280 diff --git a/profiles/hdv_720_50p b/profiles/hdv_720_50p index 1fd9b97c..5699f8df 100644 --- a/profiles/hdv_720_50p +++ b/profiles/hdv_720_50p @@ -1,4 +1,4 @@ -description=HD 720p 50Hz +description=HD 720p 50 fps frame_rate_num=50 frame_rate_den=1 width=1280 diff --git a/profiles/hdv_720_60p b/profiles/hdv_720_60p index d083937d..e1ebf9d2 100644 --- a/profiles/hdv_720_60p +++ b/profiles/hdv_720_60p @@ -1,4 +1,4 @@ -description=HD 720p 59.94Hz +description=HD 720p 59.94 fps frame_rate_num=60000 frame_rate_den=1001 width=1280 diff --git a/profiles/qcif_15 b/profiles/qcif_15 index 70d286d3..0bb00fde 100644 --- a/profiles/qcif_15 +++ b/profiles/qcif_15 @@ -1,4 +1,4 @@ -description=QCIF 15fps +description=QCIF 15 fps frame_rate_num=15 frame_rate_den=1 width=176 diff --git a/profiles/quarter_15 b/profiles/quarter_15 index 7ba8eef3..7efbf065 100644 --- a/profiles/quarter_15 +++ b/profiles/quarter_15 @@ -1,4 +1,4 @@ -description=QVGA 15fps +description=QVGA 15 fps frame_rate_num=15 frame_rate_den=1 width=320 diff --git a/profiles/quarter_ntsc b/profiles/quarter_ntsc index f2ed093f..c17032b5 100644 --- a/profiles/quarter_ntsc +++ b/profiles/quarter_ntsc @@ -1,4 +1,4 @@ -description=QVGA 29.97fps +description=QVGA 29.97 fps frame_rate_num=30000 frame_rate_den=1001 width=320 diff --git a/profiles/sdi_486i_5994 b/profiles/sdi_486i_5994 new file mode 100644 index 00000000..f2920f67 --- /dev/null +++ b/profiles/sdi_486i_5994 @@ -0,0 +1,10 @@ +description=NTSC 29.97 fps +frame_rate_num=30000 +frame_rate_den=1001 +width=720 +height=480 +progressive=0 +sample_aspect_num=1 +sample_aspect_den=1 +display_aspect_num=4 +display_aspect_den=3 diff --git a/src/framework/mlt_profile.c b/src/framework/mlt_profile.c index ec757eb0..636eb097 100644 --- a/src/framework/mlt_profile.c +++ b/src/framework/mlt_profile.c @@ -144,6 +144,7 @@ static void set_mlt_normalisation( const char *profile_name ) { if ( strstr( profile_name, "_ntsc" ) || strstr( profile_name, "_60" ) || + strstr( profile_name, "_5994" ) || strstr( profile_name, "_2997" ) || strstr( profile_name, "_30" ) ) { -- 2.39.2