RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mxfenc: support 50 and 60 frame rates 

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Matthieu Bouron 2012-05-26 18:09:07 +02:00 committed by Michael Niedermayer
parent cc4d80c99f
commit 320e537baf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mxfenc.c
View File

@ -44,8 +44,10 @@
#include "internal.h"
#include "mxf.h"
static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
static const int PAL_samples_per_frame[] = { 1920, 0 };
static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
static const int NTSC_60_samples_per_frame[] = { 801, 801, 801, 801, 800, 0 };
static const int PAL_samples_per_frame[] = { 1920, 0 };
static const int PAL_50_samples_per_frame[] = { 960, 0 };
extern AVOutputFormat ff_mxf_d10_muxer;
@ -1423,10 +1425,18 @@ static int mxf_write_header(AVFormatContext *s)
samples_per_frame = PAL_samples_per_frame;
mxf->time_base = (AVRational){ 1, 25 };
mxf->timecode_base = 25;
} else if (fabs(av_q2d(st->codec->time_base) - 1/50.0) < 0.0001) {
samples_per_frame = PAL_50_samples_per_frame;
mxf->time_base = (AVRational){ 1, 50 };
mxf->timecode_base = 50;
} else if (fabs(av_q2d(st->codec->time_base) - 1001/30000.0) < 0.0001) {
samples_per_frame = NTSC_samples_per_frame;
mxf->time_base = (AVRational){ 1001, 30000 };
mxf->timecode_base = 30;
} else if (fabs(av_q2d(st->codec->time_base) - 1001/60000.0) < 0.0001) {
samples_per_frame = NTSC_60_samples_per_frame;
mxf->time_base = (AVRational){ 1001, 60000 };
mxf->timecode_base = 60;
} else {
av_log(s, AV_LOG_ERROR, "unsupported video frame rate\n");
return -1;