Revise Hz->fps in profiles and add more ATSC profiles.

diff --git a/profiles/atsc_1080i_50 b/profiles/atsc_1080i_50
index 6157cd32675390e5c22f2811e8a689fdd4e38010..6fffa9c724b94476f637aa57f3d574658f98b2a5 100644 (file)
--- 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 (file)
index 0000000..c7a98db
--- /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 473c1cdcec0e9458c398d18282128fab183557b2..0d75b87534921d979d737f0117f1f04e819a8738 100644 (file)
--- 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 78bab246bf5b1601a943204f78ff0e5fc68099e3..76814ba92b33790c393ce02d245b7a8df8d432b9 100644 (file)
--- 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 b7dc9464fd58d5b7c4e6ed62dca66c38ff9b7341..e722b595635706513dcdaafd2f3fc068c2e1815c 100644 (file)
--- 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 8ddb6f62a9877b5db302f12ec7d8c0db7794b5f4..37b2d6dda470ad15fa4ce25622ce3f7dbed21824 100644 (file)
--- 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 e3ff6d2f76e2d2e97a71a3e2f7e91f435af3e4df..19e7fc77238b22f9e3dc5b469f5c4446fda25943 100644 (file)
--- 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 0b0109ff0f6e3856644f4f66e984a6585ddb9b25..20a533194d9aaa0637f1ec9b12ac165ccde61cf8 100644 (file)
--- 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 (file)
index 0000000..7e4c2bb
--- /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 (file)
index 0000000..51abb61
--- /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 (file)
index 0000000..2978ac4
--- /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 (file)
index 0000000..47a9171
--- /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 fea1d06075704780b5ecd1c7d7c69803b47e3ac3..5c68e8e61267173ccfcb08cb9f5e5731881e7232 100644 (file)
--- 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 (file)
index 0000000..a3ffdf3
--- /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 (file)
index 0000000..c21ec31
--- /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 (file)
index 0000000..93ff178
--- /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 263f397c66089936f54f72ae17b14448f9e27e08..e8bcd5cc42c3575b49f16dfb1ec718e68e176249 100644 (file)
--- 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 8783842c1bae2e8a6b35e33e89bf95b7aeccf001..4ac4f2f5c7e0ec42dbc8e8c048c6b0a7fda85514 100644 (file)
--- 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 3bc8b13a0188769b1c37e1f3bb48cea22e42ce0e..95299db2e61d5bd4a7339153a89afac2512120ce 100644 (file)
--- 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 bdacf8b6a7eeed6b2d1c21a8b17adae6c71d333e..83121d6d567185cafb38c282ca4c8246b94de9b7 100644 (file)
--- 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 76e91ffc745810641d4eeff4a866c821d7b2a7c2..1fac5f8497bf68b5ad02d9e370ee6a4e11bbdaae 100644 (file)
--- 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 fea1d06075704780b5ecd1c7d7c69803b47e3ac3..6490937cf5b8d9c252b2ce1d8e04751ee785bd0c 100644 (file)
--- 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 1fd9b97c3ccef5b7d0d93721526393b32f17c987..5699f8dffb96ea00abc9e910fe701fdb4f1f491a 100644 (file)
--- 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 d083937d83192e6b19702c32cf8d25de5a56c0fa..e1ebf9d2b6f14cfe364fd8c109a2c2d546c69d6f 100644 (file)
--- 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 70d286d3cb0dc94ef2ae60d05173d692261dffb8..0bb00fdeaed5c7e636e8c5e2dcb4b032c5156497 100644 (file)
--- 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 7ba8eef38272f6a173639cbeddd85238f55af449..7efbf0657f0939526ad3cfc38bc69295ae48be03 100644 (file)
--- 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 f2ed093f8415fdf189b01ffdbb51630e147cf442..c17032b575ca226bbdbad9fa12e86ae511604e40 100644 (file)
--- 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 (file)
index 0000000..f2920f6
--- /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 ec757eb01035211e3c497e174e6d2ff80f947f58..636eb097298db73c3fdb061cfbd92285d4b4bc75 100644 (file)
--- 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" ) )
                {