diff mbox

[FFmpeg-devel] avformat/mxf: fix NTSC 59.94 samples per frame layout

Message ID 20180524202714.16784-1-cus@passwd.hu
State Accepted
Commit 2b059813127cdbd0116505b8e8c8e2be0a660b85
Headers show

Commit Message

Marton Balint May 24, 2018, 8:27 p.m. UTC
FFmbc uses this.
bmx uses this.
XAVC MXF Mapping and Operating Points prefers this.
Basic rounding rules also yields these numbers.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/mxf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tomas Härdin May 26, 2018, 11:12 a.m. UTC | #1
tor 2018-05-24 klockan 22:27 +0200 skrev Marton Balint:
> FFmbc uses this.
> bmx uses this.
> XAVC MXF Mapping and Operating Points prefers this.
> Basic rounding rules also yields these numbers.
> 
> > Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>  libavformat/mxf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/mxf.c b/libavformat/mxf.c
> index a909401f08..c8b57f7f0b 100644
> --- a/libavformat/mxf.c
> +++ b/libavformat/mxf.c
> @@ -134,7 +134,7 @@ static const MXFSamplesPerFrame mxf_spf[] = {
>      { { 1001, 24000 }, { 2002, 0,    0,    0,    0,    0 } }, // FILM 23.976
>      { { 1, 24},        { 2000, 0,    0,    0,    0,    0 } }, // FILM 24
>      { { 1001, 30000 }, { 1602, 1601, 1602, 1601, 1602, 0 } }, // NTSC 29.97
> -    { { 1001, 60000 }, { 801,  801,  801,  801,  800,  0 } }, // NTSC 59.94
> +    { { 1001, 60000 }, { 801,  801,  800,  801,  801,  0 } }, // NTSC 59.94
>      { { 1, 25 },       { 1920, 0,    0,    0,    0,    0 } }, // PAL 25
>      { { 1, 50 },       { 960,  0,    0,    0,    0,    0 } }, // PAL 50
>      { { 1, 60 },       { 800,  0,    0,    0,    0,    0 } },

Looks OK

/Tomas
Marton Balint May 27, 2018, 6:15 p.m. UTC | #2
On Sat, 26 May 2018, Tomas Härdin wrote:

> tor 2018-05-24 klockan 22:27 +0200 skrev Marton Balint:
>> FFmbc uses this.
>> bmx uses this.
>> XAVC MXF Mapping and Operating Points prefers this.
>> Basic rounding rules also yields these numbers.
>> 
>> > Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>>  libavformat/mxf.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/libavformat/mxf.c b/libavformat/mxf.c
>> index a909401f08..c8b57f7f0b 100644
>> --- a/libavformat/mxf.c
>> +++ b/libavformat/mxf.c
>> @@ -134,7 +134,7 @@ static const MXFSamplesPerFrame mxf_spf[] = {
>>      { { 1001, 24000 }, { 2002, 0,    0,    0,    0,    0 } }, // FILM 23.976
>>      { { 1, 24},        { 2000, 0,    0,    0,    0,    0 } }, // FILM 24
>>      { { 1001, 30000 }, { 1602, 1601, 1602, 1601, 1602, 0 } }, // NTSC 29.97
>> -    { { 1001, 60000 }, { 801,  801,  801,  801,  800,  0 } }, // NTSC 59.94
>> +    { { 1001, 60000 }, { 801,  801,  800,  801,  801,  0 } }, // NTSC 59.94
>>      { { 1, 25 },       { 1920, 0,    0,    0,    0,    0 } }, // PAL 25
>>      { { 1, 50 },       { 960,  0,    0,    0,    0,    0 } }, // PAL 50
>>      { { 1, 60 },       { 800,  0,    0,    0,    0,    0 } },
>
> Looks OK

Thanks, applied.

Regards,
Marton
diff mbox

Patch

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index a909401f08..c8b57f7f0b 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -134,7 +134,7 @@  static const MXFSamplesPerFrame mxf_spf[] = {
     { { 1001, 24000 }, { 2002, 0,    0,    0,    0,    0 } }, // FILM 23.976
     { { 1, 24},        { 2000, 0,    0,    0,    0,    0 } }, // FILM 24
     { { 1001, 30000 }, { 1602, 1601, 1602, 1601, 1602, 0 } }, // NTSC 29.97
-    { { 1001, 60000 }, { 801,  801,  801,  801,  800,  0 } }, // NTSC 59.94
+    { { 1001, 60000 }, { 801,  801,  800,  801,  801,  0 } }, // NTSC 59.94
     { { 1, 25 },       { 1920, 0,    0,    0,    0,    0 } }, // PAL 25
     { { 1, 50 },       { 960,  0,    0,    0,    0,    0 } }, // PAL 50
     { { 1, 60 },       { 800,  0,    0,    0,    0,    0 } },