MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mxf: export ff_mxf_get_samples_per_frame to lavf

Browse Source 
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-09-20 20:31:28 +02:00 committed by Michael Niedermayer
parent 7bc70930dd
commit 41f7e0649f
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/mxf.c
View File

@ -106,3 +106,32 @@ int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum PixelFormat *pi
return -1;
}
static const MXFSamplesPerFrame mxf_samples_per_frames[] = {
{ { 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
{ { 1, 25 }, { 1920, 0, 0, 0, 0, 0 } }, // PAL 25
{ { 1, 50 }, { 960, 0, 0, 0, 0, 0 } }, // PAL 50
};
const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base)
{
int i;
for (i = 0; i < FF_ARRAY_ELEMS(mxf_samples_per_frames); i++) {
if (!av_cmp_q(mxf_samples_per_frames[i].time_base, time_base))
return &mxf_samples_per_frames[i];
}
// Find closest container time base for approximative codec time base like 1/29.97, 1/30, ...
for (i = 0; i < FF_ARRAY_ELEMS(mxf_samples_per_frames); i++) {
if (fabs(av_q2d(mxf_samples_per_frames[i].time_base) - av_q2d(time_base)) < 0.0001) {
av_log(s, AV_LOG_WARNING, "%d/%d input time base matched %d/%d container time base\n",
time_base.num, time_base.den,
mxf_samples_per_frames[i].time_base.num, mxf_samples_per_frames[i].time_base.den);
return &mxf_samples_per_frames[i];
}
}
return NULL;
}

7
libavformat/mxf.h
View File

@ -21,6 +21,7 @@
#ifndef AVFORMAT_MXF_H
#define AVFORMAT_MXF_H
#include "avformat.h"
#include "libavcodec/avcodec.h"
#include <stdint.h>
@ -66,11 +67,17 @@ typedef struct {
int id;
} MXFCodecUL;
typedef struct {
struct AVRational time_base;
int samples_per_frame[6];
} MXFSamplesPerFrame;
extern const MXFCodecUL ff_mxf_data_definition_uls[];
extern const MXFCodecUL ff_mxf_codec_uls[];
extern const MXFCodecUL ff_mxf_pixel_format_uls[];
int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum PixelFormat *pix_fmt);
const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base);
#define PRINT_KEY(pc, s, x) av_dlog(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
(x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])

38
libavformat/mxfenc.c
View File

@ -47,40 +47,6 @@
#include "mxf.h"
#include "config.h"
typedef struct {
struct AVRational time_base;
int samples_per_frame[6];
} MXFSamplesPerFrame;
static const MXFSamplesPerFrame mxf_samples_per_frames[] = {
{ { 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
{ { 1, 25 }, { 1920, 0, 0, 0, 0, 0 } }, // PAL 25
{ { 1, 50 }, { 960, 0, 0, 0, 0, 0 } }, // PAL 50
};
static const MXFSamplesPerFrame* mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base)
{
int i;
for (i = 0; i < FF_ARRAY_ELEMS(mxf_samples_per_frames); i++) {
if (!av_cmp_q(mxf_samples_per_frames[i].time_base, time_base))
return &mxf_samples_per_frames[i];
}
// Find closest container time base for approximative codec time base like 1/29.97, 1/30, ...
for (i = 0; i < FF_ARRAY_ELEMS(mxf_samples_per_frames); i++) {
if (fabs(av_q2d(mxf_samples_per_frames[i].time_base) - av_q2d(time_base)) < 0.0001) {
av_log(s, AV_LOG_WARNING, "%d/%d input time base matched %d/%d container time base\n",
time_base.num, time_base.den,
mxf_samples_per_frames[i].time_base.num, mxf_samples_per_frames[i].time_base.den);
return &mxf_samples_per_frames[i];
}
}
return NULL;
}
extern AVOutputFormat ff_mxf_d10_muxer;
#define EDIT_UNITS_PER_BODY 250
@ -1716,7 +1682,7 @@ static int mxf_write_header(AVFormatContext *s)
// Default component depth to 8
sc->component_depth = 8;
mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num;
spf = mxf_get_samples_per_frame(s, tbc);
spf = ff_mxf_get_samples_per_frame(s, tbc);
if (!spf) {
av_log(s, AV_LOG_ERROR, "Unsupported video frame rate %d/%d\n",
tbc.den, tbc.num);
@ -1827,7 +1793,7 @@ static int mxf_write_header(AVFormatContext *s)
mxf->timecode_track->index = -1;
if (!spf)
spf = mxf_get_samples_per_frame(s, (AVRational){ 1, 25 });
spf = ff_mxf_get_samples_per_frame(s, (AVRational){ 1, 25 });
if (ff_audio_interleave_init(s, spf->samples_per_frame, mxf->time_base) < 0)
return -1;