X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fgxfenc.c;h=a6f4b7260efb7d58e46d39524bf8ffa8ab145ba7;hb=862be470f3f96b7a0abc0c87fbc4ad463571ddee;hp=0b52723156001fd7b14347f69b9e086ac6e8150c;hpb=8b9c94e0bd315635a77a82d8a5ee5f394c280873;p=ffmpeg diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 0b527231560..a6f4b7260ef 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/fifo.h" #include "avformat.h" #include "gxf.h" #include "riff.h" @@ -29,13 +28,11 @@ typedef struct GXFStreamContext { AudioInterleaveContext aic; - AVCodecContext *codec; uint32_t track_type; uint32_t sample_size; uint32_t sample_rate; uint16_t media_type; uint16_t media_info; - uint8_t index; int frame_rate_index; int lines_index; int fields; @@ -45,6 +42,7 @@ typedef struct GXFStreamContext { int p_per_gop; int b_per_i_or_p; ///< number of B frames per I frame or P frame int first_gop_closed; + unsigned order; ///< interleaving order } GXFStreamContext; typedef struct GXFContext { @@ -55,24 +53,22 @@ typedef struct GXFContext { uint32_t umf_start_offset; uint32_t umf_track_offset; uint32_t umf_media_offset; - uint32_t umf_user_data_offset; - uint32_t umf_user_data_size; uint32_t umf_length; uint16_t umf_track_size; uint16_t umf_media_size; - int sample_rate; + AVRational time_base; int flags; - AVFormatContext *fc; + GXFStreamContext timecode_track; + unsigned *flt_entries; ///< offsets of packets /1024, starts after 2nd video field + unsigned flt_entries_nb; + uint64_t *map_offsets; ///< offset of map packets + unsigned map_offsets_nb; + unsigned packet_count; } GXFContext; -typedef struct GXF_Lines { - int height; - int index; -} GXF_Lines; - - -/* FIXME check if it is relevant */ -static const GXF_Lines gxf_lines_tab[] = { +static const struct { + int height, index; +} gxf_lines_tab[] = { { 480, 1 }, /* NTSC */ { 512, 1 }, /* NTSC + VBI */ { 576, 2 }, /* PAL */ @@ -97,19 +93,20 @@ static const AVCodecTag gxf_media_types[] = { { CODEC_ID_MPEG2VIDEO, 20 }, /* MPEG HD */ { CODEC_ID_MPEG1VIDEO, 22 }, /* NTSC */ { CODEC_ID_MPEG1VIDEO, 23 }, /* PAL */ - { 0, 0 }, + { CODEC_ID_NONE, 0 }, }; -#define SERVER_PATH "/space/" -#define ES_NAME_PATTERN "ES." +#define SERVER_PATH "EXT:/PDR/default/" +#define ES_NAME_PATTERN "EXT:/PDR/default/ES." -static int gxf_find_lines_index(GXFStreamContext *ctx) +static int gxf_find_lines_index(AVStream *st) { + GXFStreamContext *sc = st->priv_data; int i; for (i = 0; i < 6; ++i) { - if (ctx->codec->height == gxf_lines_tab[i].height) { - ctx->lines_index = gxf_lines_tab[i].index; + if (st->codec->height == gxf_lines_tab[i].height) { + sc->lines_index = gxf_lines_tab[i].index; return 0; } } @@ -162,46 +159,46 @@ static void gxf_write_packet_header(ByteIOContext *pb, GXFPktType type) put_byte(pb, 0xE2); /* trailer 2 */ } -static int gxf_write_mpeg_auxiliary(ByteIOContext *pb, GXFStreamContext *ctx) +static int gxf_write_mpeg_auxiliary(ByteIOContext *pb, AVStream *st) { + GXFStreamContext *sc = st->priv_data; char buffer[1024]; int size, starting_line; - if (ctx->iframes) { - ctx->p_per_gop = ctx->pframes / ctx->iframes; - if (ctx->pframes % ctx->iframes) - ctx->p_per_gop++; - if (ctx->pframes) { - ctx->b_per_i_or_p = ctx->bframes / ctx->pframes; - if (ctx->bframes % ctx->pframes) - ctx->b_per_i_or_p++; + if (sc->iframes) { + sc->p_per_gop = sc->pframes / sc->iframes; + if (sc->pframes % sc->iframes) + sc->p_per_gop++; + if (sc->pframes) { + sc->b_per_i_or_p = sc->bframes / sc->pframes; + if (sc->bframes % sc->pframes) + sc->b_per_i_or_p++; } - if (ctx->p_per_gop > 9) - ctx->p_per_gop = 9; /* ensure value won't take more than one char */ - if (ctx->b_per_i_or_p > 9) - ctx->b_per_i_or_p = 9; /* ensure value won't take more than one char */ + if (sc->p_per_gop > 9) + sc->p_per_gop = 9; /* ensure value won't take more than one char */ + if (sc->b_per_i_or_p > 9) + sc->b_per_i_or_p = 9; /* ensure value won't take more than one char */ } - if (ctx->codec->height == 512 || ctx->codec->height == 608) + if (st->codec->height == 512 || st->codec->height == 608) starting_line = 7; // VBI - else if (ctx->codec->height == 480) + else if (st->codec->height == 480) starting_line = 20; else starting_line = 23; // default PAL size = snprintf(buffer, 1024, "Ver 1\nBr %.6f\nIpg 1\nPpi %d\nBpiop %d\n" "Pix 0\nCf %d\nCg %d\nSl %d\nnl16 %d\nVi 1\nf1 1\n", - (float)ctx->codec->bit_rate, ctx->p_per_gop, ctx->b_per_i_or_p, - ctx->codec->pix_fmt == PIX_FMT_YUV422P ? 2 : 1, ctx->first_gop_closed == 1, - starting_line, ctx->codec->height / 16); + (float)st->codec->bit_rate, sc->p_per_gop, sc->b_per_i_or_p, + st->codec->pix_fmt == PIX_FMT_YUV422P ? 2 : 1, sc->first_gop_closed == 1, + starting_line, st->codec->height / 16); put_byte(pb, TRACK_MPG_AUX); put_byte(pb, size + 1); put_buffer(pb, (uint8_t *)buffer, size + 1); return size + 3; } -static int gxf_write_timecode_auxiliary(ByteIOContext *pb, GXFStreamContext *ctx) +static int gxf_write_timecode_auxiliary(ByteIOContext *pb, GXFStreamContext *sc) { - /* FIXME implement that */ put_byte(pb, 0); /* fields */ put_byte(pb, 0); /* seconds */ put_byte(pb, 0); /* minutes */ @@ -211,13 +208,15 @@ static int gxf_write_timecode_auxiliary(ByteIOContext *pb, GXFStreamContext *ctx return 8; } -static int gxf_write_track_description(ByteIOContext *pb, GXFStreamContext *stream) +static int gxf_write_track_description(AVFormatContext *s, GXFStreamContext *sc, int index) { + ByteIOContext *pb = s->pb; int64_t pos; + int mpeg = sc->track_type == 4 || sc->track_type == 9; /* track description section */ - put_byte(pb, stream->media_type + 0x80); - put_byte(pb, stream->index + 0xC0); + put_byte(pb, sc->media_type + 0x80); + put_byte(pb, index + 0xC0); pos = url_ftell(pb); put_be16(pb, 0); /* size */ @@ -226,15 +225,15 @@ static int gxf_write_track_description(ByteIOContext *pb, GXFStreamContext *stre put_byte(pb, TRACK_NAME); put_byte(pb, strlen(ES_NAME_PATTERN) + 3); put_tag(pb, ES_NAME_PATTERN); - put_be16(pb, stream->media_info); + put_be16(pb, sc->media_info); put_byte(pb, 0); - if (stream->codec->codec_id != CODEC_ID_MPEG2VIDEO) { + if (!mpeg) { /* auxiliary information */ put_byte(pb, TRACK_AUX); put_byte(pb, 8); - if (stream->codec->codec_id == CODEC_ID_NONE) - gxf_write_timecode_auxiliary(pb, stream); + if (sc->track_type == 3) + gxf_write_timecode_auxiliary(pb, sc); else put_le64(pb, 0); } @@ -244,31 +243,33 @@ static int gxf_write_track_description(ByteIOContext *pb, GXFStreamContext *stre put_byte(pb, 4); put_be32(pb, 0); - if (stream->codec->codec_id == CODEC_ID_MPEG2VIDEO) - gxf_write_mpeg_auxiliary(pb, stream); + if (mpeg) + gxf_write_mpeg_auxiliary(pb, s->streams[index]); /* frame rate */ put_byte(pb, TRACK_FPS); put_byte(pb, 4); - put_be32(pb, stream->frame_rate_index); + put_be32(pb, sc->frame_rate_index); /* lines per frame */ put_byte(pb, TRACK_LINES); put_byte(pb, 4); - put_be32(pb, stream->lines_index); + put_be32(pb, sc->lines_index); /* fields per frame */ put_byte(pb, TRACK_FPF); put_byte(pb, 4); - put_be32(pb, stream->fields); + put_be32(pb, sc->fields); return updateSize(pb, pos); } -static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_material_data_section(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos; - const char *filename = strrchr(ctx->fc->filename, '/'); + const char *filename = strrchr(s->filename, '/'); pos = url_ftell(pb); put_be16(pb, 0); /* size */ @@ -277,7 +278,7 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx) if (filename) filename++; else - filename = ctx->fc->filename; + filename = s->filename; put_byte(pb, MAT_NAME); put_byte(pb, strlen(SERVER_PATH) + strlen(filename) + 1); put_tag(pb, SERVER_PATH); @@ -292,7 +293,7 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx) /* last field */ put_byte(pb, MAT_LAST_FIELD); put_byte(pb, 4); - put_be32(pb, ctx->nb_fields); + put_be32(pb, gxf->nb_fields); /* reserved */ put_byte(pb, MAT_MARK_IN); @@ -301,7 +302,7 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx) put_byte(pb, MAT_MARK_OUT); put_byte(pb, 4); - put_be32(pb, ctx->nb_fields); + put_be32(pb, gxf->nb_fields); /* estimated size */ put_byte(pb, MAT_SIZE); @@ -311,139 +312,165 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx) return updateSize(pb, pos); } -static int gxf_write_track_description_section(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_track_description_section(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos; int i; pos = url_ftell(pb); put_be16(pb, 0); /* size */ - for (i = 0; i < ctx->fc->nb_streams; ++i) - gxf_write_track_description(pb, ctx->fc->streams[i]->priv_data); + for (i = 0; i < s->nb_streams; ++i) + gxf_write_track_description(s, s->streams[i]->priv_data, i); + + gxf_write_track_description(s, &gxf->timecode_track, s->nb_streams); + return updateSize(pb, pos); } -static int gxf_write_map_packet(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_map_packet(AVFormatContext *s, int rewrite) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos = url_ftell(pb); + if (!rewrite) { + if (!(gxf->map_offsets_nb % 30)) { + gxf->map_offsets = av_realloc(gxf->map_offsets, + (gxf->map_offsets_nb+30)*sizeof(*gxf->map_offsets)); + if (!gxf->map_offsets) { + av_log(s, AV_LOG_ERROR, "could not realloc map offsets\n"); + return -1; + } + } + gxf->map_offsets[gxf->map_offsets_nb++] = pos; // do not increment here + } + gxf_write_packet_header(pb, PKT_MAP); /* preamble */ put_byte(pb, 0xE0); /* version */ put_byte(pb, 0xFF); /* reserved */ - gxf_write_material_data_section(pb, ctx); - gxf_write_track_description_section(pb, ctx); + gxf_write_material_data_section(s); + gxf_write_track_description_section(s); return updatePacketSize(pb, pos); } -#if 0 -static int gxf_write_flt_packet(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_flt_packet(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos = url_ftell(pb); - int i; + int fields_per_flt = (gxf->nb_fields+1) / 1000 + 1; + int flt_entries = gxf->nb_fields / fields_per_flt - 1; + int i = 0; gxf_write_packet_header(pb, PKT_FLT); - put_le32(pb, 1000); /* number of fields */ - put_le32(pb, 0); /* number of active flt entries */ + put_le32(pb, fields_per_flt); /* number of fields */ + put_le32(pb, flt_entries); /* number of active flt entries */ - for (i = 0; i < 1000; ++i) { - put_le32(pb, 0); + if (gxf->flt_entries) { + for (i = 0; i < flt_entries; i++) + put_le32(pb, gxf->flt_entries[(i*fields_per_flt)>>1]); } + + for (; i < 1000; i++) + put_le32(pb, 0); + return updatePacketSize(pb, pos); } -#endif -static int gxf_write_umf_material_description(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_umf_material_description(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; + int timecode_base = gxf->time_base.den == 60000 ? 60 : 50; + // XXX drop frame uint32_t timecode = - ctx->nb_fields / (ctx->sample_rate * 3600) % 24 << 24 | // hours - ctx->nb_fields / (ctx->sample_rate * 60) % 60 << 16 | // minutes - ctx->nb_fields / ctx->sample_rate % 60 << 8 | // seconds - ctx->nb_fields % ctx->sample_rate; // fields - - put_le32(pb, ctx->flags); - put_le32(pb, ctx->nb_fields); /* length of the longest track */ - put_le32(pb, ctx->nb_fields); /* length of the shortest track */ + gxf->nb_fields / (timecode_base * 3600) % 24 << 24 | // hours + gxf->nb_fields / (timecode_base * 60) % 60 << 16 | // minutes + gxf->nb_fields / timecode_base % 60 << 8 | // seconds + gxf->nb_fields % timecode_base; // fields + + put_le32(pb, gxf->flags); + put_le32(pb, gxf->nb_fields); /* length of the longest track */ + put_le32(pb, gxf->nb_fields); /* length of the shortest track */ put_le32(pb, 0); /* mark in */ - put_le32(pb, ctx->nb_fields); /* mark out */ + put_le32(pb, gxf->nb_fields); /* mark out */ put_le32(pb, 0); /* timecode mark in */ put_le32(pb, timecode); /* timecode mark out */ - put_le64(pb, ctx->fc->timestamp); /* modification time */ - put_le64(pb, ctx->fc->timestamp); /* creation time */ + put_le64(pb, s->timestamp); /* modification time */ + put_le64(pb, s->timestamp); /* creation time */ put_le16(pb, 0); /* reserved */ put_le16(pb, 0); /* reserved */ - put_le16(pb, ctx->audio_tracks); - put_le16(pb, 0); /* timecode track count */ + put_le16(pb, gxf->audio_tracks); + put_le16(pb, 1); /* timecode track count */ put_le16(pb, 0); /* reserved */ - put_le16(pb, ctx->mpeg_tracks); + put_le16(pb, gxf->mpeg_tracks); return 48; } -static int gxf_write_umf_payload(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_umf_payload(AVFormatContext *s) { - put_le32(pb, ctx->umf_length); /* total length of the umf data */ + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; + + put_le32(pb, gxf->umf_length); /* total length of the umf data */ put_le32(pb, 3); /* version */ - put_le32(pb, ctx->fc->nb_streams); - put_le32(pb, ctx->umf_track_offset); /* umf track section offset */ - put_le32(pb, ctx->umf_track_size); - put_le32(pb, ctx->fc->nb_streams); - put_le32(pb, ctx->umf_media_offset); - put_le32(pb, ctx->umf_media_size); - put_le32(pb, ctx->umf_user_data_offset); /* user data offset */ - put_le32(pb, ctx->umf_user_data_size); /* user data size */ + put_le32(pb, s->nb_streams+1); + put_le32(pb, gxf->umf_track_offset); /* umf track section offset */ + put_le32(pb, gxf->umf_track_size); + put_le32(pb, s->nb_streams+1); + put_le32(pb, gxf->umf_media_offset); + put_le32(pb, gxf->umf_media_size); + put_le32(pb, gxf->umf_length); /* user data offset */ + put_le32(pb, 0); /* user data size */ put_le32(pb, 0); /* reserved */ put_le32(pb, 0); /* reserved */ return 48; } -static int gxf_write_umf_track_description(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_umf_track_description(AVFormatContext *s) { + ByteIOContext *pb = s->pb; + GXFContext *gxf = s->priv_data; int64_t pos = url_ftell(pb); - int tracks[255]={0}; int i; - ctx->umf_track_offset = pos - ctx->umf_start_offset; - for (i = 0; i < ctx->fc->nb_streams; ++i) { - AVStream *st = ctx->fc->streams[i]; - GXFStreamContext *sc = st->priv_data; - int id = 0; - - switch (st->codec->codec_id) { - case CODEC_ID_MPEG1VIDEO: id= 'L'; break; - case CODEC_ID_MPEG2VIDEO: id= 'M'; break; - case CODEC_ID_PCM_S16LE: id= 'A'; break; - case CODEC_ID_DVVIDEO: id= sc->track_type == 6 ? 'E' : 'D'; break; - case CODEC_ID_MJPEG: id= 'V'; break; - default: break; - } - sc->media_info= id << 8; - /* FIXME first 10 audio tracks are 0 to 9 next 22 are A to V */ - sc->media_info |= '0' + (tracks[id]++); + gxf->umf_track_offset = pos - gxf->umf_start_offset; + for (i = 0; i < s->nb_streams; ++i) { + GXFStreamContext *sc = s->streams[i]->priv_data; put_le16(pb, sc->media_info); put_le16(pb, 1); } + + put_le16(pb, gxf->timecode_track.media_info); + put_le16(pb, 1); + return url_ftell(pb) - pos; } -static int gxf_write_umf_media_mpeg(ByteIOContext *pb, GXFStreamContext *stream) +static int gxf_write_umf_media_mpeg(ByteIOContext *pb, AVStream *st) { - if (stream->codec->pix_fmt == PIX_FMT_YUV422P) + GXFStreamContext *sc = st->priv_data; + + if (st->codec->pix_fmt == PIX_FMT_YUV422P) put_le32(pb, 2); else put_le32(pb, 1); /* default to 420 */ - put_le32(pb, stream->first_gop_closed == 1); /* closed = 1, open = 0, unknown = 255 */ + put_le32(pb, sc->first_gop_closed == 1); /* closed = 1, open = 0, unknown = 255 */ put_le32(pb, 3); /* top = 1, bottom = 2, frame = 3, unknown = 0 */ put_le32(pb, 1); /* I picture per GOP */ - put_le32(pb, stream->p_per_gop); - put_le32(pb, stream->b_per_i_or_p); - if (stream->codec->codec_id == CODEC_ID_MPEG2VIDEO) + put_le32(pb, sc->p_per_gop); + put_le32(pb, sc->b_per_i_or_p); + if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) put_le32(pb, 2); - else if (stream->codec->codec_id == CODEC_ID_MPEG1VIDEO) + else if (st->codec->codec_id == CODEC_ID_MPEG1VIDEO) put_le32(pb, 1); else put_le32(pb, 0); @@ -451,21 +478,20 @@ static int gxf_write_umf_media_mpeg(ByteIOContext *pb, GXFStreamContext *stream) return 32; } -static int gxf_write_umf_media_timecode(ByteIOContext *pb, GXFStreamContext *track) +static int gxf_write_umf_media_timecode(ByteIOContext *pb, GXFStreamContext *sc) { - /* FIXME implement */ - put_be32(pb, 0); /* drop frame flag */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ - put_be32(pb, 0); /* reserved */ + put_le32(pb, 1); /* non drop frame */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ + put_le32(pb, 0); /* reserved */ return 32; } -static int gxf_write_umf_media_dv(ByteIOContext *pb, GXFStreamContext *track) +static int gxf_write_umf_media_dv(ByteIOContext *pb, GXFStreamContext *sc) { int i; @@ -475,7 +501,7 @@ static int gxf_write_umf_media_dv(ByteIOContext *pb, GXFStreamContext *track) return 32; } -static int gxf_write_umf_media_audio(ByteIOContext *pb, GXFStreamContext *track) +static int gxf_write_umf_media_audio(ByteIOContext *pb, GXFStreamContext *sc) { put_le64(pb, av_dbl2int(1)); /* sound level to begin to */ put_le64(pb, av_dbl2int(1)); /* sound level to begin to */ @@ -487,7 +513,7 @@ static int gxf_write_umf_media_audio(ByteIOContext *pb, GXFStreamContext *track) } #if 0 -static int gxf_write_umf_media_mjpeg(ByteIOContext *pb, GXFStreamContext *track) +static int gxf_write_umf_media_mjpeg(ByteIOContext *pb, GXFStreamContext *sc) { put_be64(pb, 0); /* FIXME FLOAT max chroma quant level */ put_be64(pb, 0); /* FIXME FLOAT max luma quant level */ @@ -497,50 +523,59 @@ static int gxf_write_umf_media_mjpeg(ByteIOContext *pb, GXFStreamContext *track) } #endif -static int gxf_write_umf_media_description(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_umf_media_description(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos; - int i; + int i, j; pos = url_ftell(pb); - ctx->umf_media_offset = pos - ctx->umf_start_offset; - for (i = 0; i < ctx->fc->nb_streams; ++i) { - GXFStreamContext *sc = ctx->fc->streams[i]->priv_data; - char buffer[88]; + gxf->umf_media_offset = pos - gxf->umf_start_offset; + for (i = 0; i <= s->nb_streams; ++i) { + GXFStreamContext *sc; int64_t startpos, curpos; - int path_size = strlen(ES_NAME_PATTERN); - memset(buffer, 0, 88); + if (i == s->nb_streams) + sc = &gxf->timecode_track; + else + sc = s->streams[i]->priv_data; + startpos = url_ftell(pb); put_le16(pb, 0); /* length */ put_le16(pb, sc->media_info); put_le16(pb, 0); /* reserved */ put_le16(pb, 0); /* reserved */ - put_le32(pb, ctx->nb_fields); + put_le32(pb, gxf->nb_fields); put_le32(pb, 0); /* attributes rw, ro */ put_le32(pb, 0); /* mark in */ - put_le32(pb, ctx->nb_fields); /* mark out */ - strncpy(buffer, ES_NAME_PATTERN, path_size); - put_buffer(pb, (uint8_t *)buffer, path_size); + put_le32(pb, gxf->nb_fields); /* mark out */ + put_buffer(pb, ES_NAME_PATTERN, sizeof(ES_NAME_PATTERN)); put_be16(pb, sc->media_info); - put_buffer(pb, (uint8_t *)buffer + path_size + 2, 88 - path_size - 2); + for (j = sizeof(ES_NAME_PATTERN)+2; j < 88; j++) + put_byte(pb, 0); put_le32(pb, sc->track_type); put_le32(pb, sc->sample_rate); put_le32(pb, sc->sample_size); put_le32(pb, 0); /* reserved */ - switch (sc->codec->codec_id) { - case CODEC_ID_MPEG2VIDEO: - gxf_write_umf_media_mpeg(pb, sc); - break; - case CODEC_ID_PCM_S16LE: - gxf_write_umf_media_audio(pb, sc); - break; - case CODEC_ID_DVVIDEO: - gxf_write_umf_media_dv(pb, sc); - break; - default: + + if (sc == &gxf->timecode_track) gxf_write_umf_media_timecode(pb, sc); /* 8 0bytes */ + else { + AVStream *st = s->streams[i]; + switch (st->codec->codec_id) { + case CODEC_ID_MPEG2VIDEO: + gxf_write_umf_media_mpeg(pb, st); + break; + case CODEC_ID_PCM_S16LE: + gxf_write_umf_media_audio(pb, sc); + break; + case CODEC_ID_DVVIDEO: + gxf_write_umf_media_dv(pb, sc); + break; + } } + curpos = url_ftell(pb); url_fseek(pb, startpos, SEEK_SET); put_le16(pb, curpos - startpos); @@ -549,51 +584,57 @@ static int gxf_write_umf_media_description(ByteIOContext *pb, GXFContext *ctx) return url_ftell(pb) - pos; } -static int gxf_write_umf_user_data(ByteIOContext *pb, GXFContext *ctx) -{ - int64_t pos = url_ftell(pb); - ctx->umf_user_data_offset = pos - ctx->umf_start_offset; - put_le32(pb, 20); - put_le32(pb, 0); - put_le16(pb, 0); - put_le16(pb, 0); - put_le32(pb, 0); - put_byte(pb, 0); - put_byte(pb, 0); - put_byte(pb, 0); - put_byte(pb, 0); - return 20; -} - -static int gxf_write_umf_packet(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_umf_packet(AVFormatContext *s) { + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t pos = url_ftell(pb); gxf_write_packet_header(pb, PKT_UMF); /* preamble */ put_byte(pb, 3); /* first and last (only) packet */ - put_be32(pb, ctx->umf_length); /* data length */ - - ctx->umf_start_offset = url_ftell(pb); - gxf_write_umf_payload(pb, ctx); - gxf_write_umf_material_description(pb, ctx); - ctx->umf_track_size = gxf_write_umf_track_description(pb, ctx); - ctx->umf_media_size = gxf_write_umf_media_description(pb, ctx); - ctx->umf_user_data_size = gxf_write_umf_user_data(pb, ctx); - ctx->umf_length = url_ftell(pb) - ctx->umf_start_offset; + put_be32(pb, gxf->umf_length); /* data length */ + + gxf->umf_start_offset = url_ftell(pb); + gxf_write_umf_payload(s); + gxf_write_umf_material_description(s); + gxf->umf_track_size = gxf_write_umf_track_description(s); + gxf->umf_media_size = gxf_write_umf_media_description(s); + gxf->umf_length = url_ftell(pb) - gxf->umf_start_offset; return updatePacketSize(pb, pos); } static const int GXF_samples_per_frame[] = { 32768, 0 }; +static void gxf_init_timecode_track(GXFStreamContext *sc, GXFStreamContext *vsc) +{ + if (!vsc) + return; + + sc->media_type = vsc->sample_rate == 60 ? 7 : 8; + sc->sample_rate = vsc->sample_rate; + sc->media_info = ('T'<<8) | '0'; + sc->track_type = 3; + sc->frame_rate_index = vsc->frame_rate_index; + sc->lines_index = vsc->lines_index; + sc->sample_size = 16; + sc->fields = vsc->fields; +} + static int gxf_write_header(AVFormatContext *s) { ByteIOContext *pb = s->pb; GXFContext *gxf = s->priv_data; - int i; + GXFStreamContext *vsc = NULL; + uint8_t tracks[255] = {0}; + int i, media_info = 0; + + if (url_is_streamed(pb)) { + av_log(s, AV_LOG_ERROR, "gxf muxer does not support streamed output, patch welcome"); + return -1; + } - gxf->fc = s; gxf->flags |= 0x00080000; /* material is simple clip */ for (i = 0; i < s->nb_streams; ++i) { AVStream *st = s->streams[i]; @@ -602,10 +643,8 @@ static int gxf_write_header(AVFormatContext *s) return AVERROR(ENOMEM); st->priv_data = sc; - sc->codec = st->codec; - sc->index = i; - sc->media_type = codec_get_tag(gxf_media_types, sc->codec->codec_id); - if (st->codec->codec_type == CODEC_TYPE_AUDIO) { + sc->media_type = ff_codec_get_tag(gxf_media_types, st->codec->codec_id); + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { if (st->codec->codec_id != CODEC_ID_PCM_S16LE) { av_log(s, AV_LOG_ERROR, "only 16 BIT PCM LE allowed for now\n"); return -1; @@ -627,39 +666,61 @@ static int gxf_write_header(AVFormatContext *s) sc->fields = -2; gxf->audio_tracks++; gxf->flags |= 0x04000000; /* audio is 16 bit pcm */ - } else if (sc->codec->codec_type == CODEC_TYPE_VIDEO) { + media_info = 'A'; + } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + if (i != 0) { + av_log(s, AV_LOG_ERROR, "video stream must be the first track\n"); + return -1; + } /* FIXME check from time_base ? */ - if (sc->codec->height == 480 || sc->codec->height == 512) { /* NTSC or NTSC+VBI */ + if (st->codec->height == 480 || st->codec->height == 512) { /* NTSC or NTSC+VBI */ sc->frame_rate_index = 5; sc->sample_rate = 60; gxf->flags |= 0x00000080; + gxf->time_base = (AVRational){ 1001, 60000 }; } else { /* assume PAL */ sc->frame_rate_index = 6; sc->media_type++; sc->sample_rate = 50; gxf->flags |= 0x00000040; + gxf->time_base = (AVRational){ 1, 50 }; } - gxf->sample_rate = sc->sample_rate; - av_set_pts_info(st, 64, 1, st->codec->time_base.den); - if (gxf_find_lines_index(sc) < 0) + av_set_pts_info(st, 64, gxf->time_base.num, gxf->time_base.den); + if (gxf_find_lines_index(st) < 0) sc->lines_index = -1; sc->sample_size = st->codec->bit_rate; sc->fields = 2; /* interlaced */ - switch (sc->codec->codec_id) { + + vsc = sc; + + switch (st->codec->codec_id) { + case CODEC_ID_MJPEG: + sc->track_type = 1; + gxf->flags |= 0x00004000; + media_info = 'J'; + break; + case CODEC_ID_MPEG1VIDEO: + sc->track_type = 9; + gxf->mpeg_tracks++; + media_info = 'L'; + break; case CODEC_ID_MPEG2VIDEO: sc->first_gop_closed = -1; sc->track_type = 4; gxf->mpeg_tracks++; gxf->flags |= 0x00008000; + media_info = 'M'; break; case CODEC_ID_DVVIDEO: - if (sc->codec->pix_fmt == PIX_FMT_YUV422P) { + if (st->codec->pix_fmt == PIX_FMT_YUV422P) { sc->media_type += 2; sc->track_type = 6; gxf->flags |= 0x00002000; + media_info = 'E'; } else { sc->track_type = 5; gxf->flags |= 0x00001000; + media_info = 'D'; } break; default: @@ -667,19 +728,28 @@ static int gxf_write_header(AVFormatContext *s) return -1; } } + /* FIXME first 10 audio tracks are 0 to 9 next 22 are A to V */ + sc->media_info = media_info<<8 | ('0'+tracks[media_info]++); + sc->order = s->nb_streams - st->index; } if (ff_audio_interleave_init(s, GXF_samples_per_frame, (AVRational){ 1, 48000 }) < 0) return -1; - gxf_write_map_packet(pb, gxf); - //gxf_write_flt_packet(pb, gxf); - gxf_write_umf_packet(pb, gxf); + gxf_init_timecode_track(&gxf->timecode_track, vsc); + gxf->flags |= 0x200000; // time code track is non-drop frame + + gxf_write_map_packet(s, 0); + gxf_write_flt_packet(s); + gxf_write_umf_packet(s); + + gxf->packet_count = 3; + put_flush_packet(pb); return 0; } -static int gxf_write_eos_packet(ByteIOContext *pb, GXFContext *ctx) +static int gxf_write_eos_packet(ByteIOContext *pb) { int64_t pos = url_ftell(pb); @@ -689,20 +759,33 @@ static int gxf_write_eos_packet(ByteIOContext *pb, GXFContext *ctx) static int gxf_write_trailer(AVFormatContext *s) { - ByteIOContext *pb = s->pb; GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; int64_t end; + int i; ff_audio_interleave_close(s); - gxf_write_eos_packet(pb, gxf); + gxf_write_eos_packet(pb); end = url_ftell(pb); url_fseek(pb, 0, SEEK_SET); - /* overwrite map and umf packets with new values */ - gxf_write_map_packet(pb, gxf); - //gxf_write_flt_packet(pb, gxf); - gxf_write_umf_packet(pb, gxf); + /* overwrite map, flt and umf packets with new values */ + gxf_write_map_packet(s, 1); + gxf_write_flt_packet(s); + gxf_write_umf_packet(s); + put_flush_packet(pb); + /* update duration in all map packets */ + for (i = 1; i < gxf->map_offsets_nb; i++) { + url_fseek(pb, gxf->map_offsets[i], SEEK_SET); + gxf_write_map_packet(s, 1); + put_flush_packet(pb); + } + url_fseek(pb, end, SEEK_SET); + + av_freep(&gxf->flt_entries); + av_freep(&gxf->map_offsets); + return 0; } @@ -718,26 +801,30 @@ static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int si return (buf[i+1]>>3)&7; } -static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt, int size) +static int gxf_write_media_preamble(AVFormatContext *s, AVPacket *pkt, int size) { - GXFStreamContext *sc = ctx->fc->streams[pkt->stream_index]->priv_data; + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; + AVStream *st = s->streams[pkt->stream_index]; + GXFStreamContext *sc = st->priv_data; unsigned field_nb; /* If the video is frame-encoded, the frame numbers shall be represented by * even field numbers. * see SMPTE360M-2004 6.4.2.1.3 Media field number */ - if (sc->codec->codec_type == CODEC_TYPE_VIDEO) { - field_nb = ctx->nb_fields; + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + field_nb = gxf->nb_fields; } else { - field_nb = av_rescale_rnd(pkt->dts, ctx->sample_rate, sc->codec->time_base.den, AV_ROUND_UP); + field_nb = av_rescale_rnd(pkt->dts, gxf->time_base.den, + (int64_t)48000*gxf->time_base.num, AV_ROUND_UP); } put_byte(pb, sc->media_type); - put_byte(pb, sc->index); + put_byte(pb, st->index); put_be32(pb, field_nb); - if (sc->codec->codec_type == CODEC_TYPE_AUDIO) { + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { put_be16(pb, 0); put_be16(pb, size / 2); - } else if (sc->codec->codec_id == CODEC_ID_MPEG2VIDEO) { + } else if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO) { int frame_type = gxf_parse_mpeg_frame(sc, pkt->data, pkt->size); if (frame_type == FF_I_TYPE) { put_byte(pb, 0x0d); @@ -750,7 +837,7 @@ static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket sc->pframes++; } put_be24(pb, size); - } else if (sc->codec->codec_id == CODEC_ID_DVVIDEO) { + } else if (st->codec->codec_id == CODEC_ID_DVVIDEO) { put_byte(pb, size / 4096); put_be24(pb, 0); } else @@ -761,40 +848,77 @@ static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket return 16; } -static int gxf_write_media_packet(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt) +static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) { - GXFStreamContext *sc = ctx->fc->streams[pkt->stream_index]->priv_data; + GXFContext *gxf = s->priv_data; + ByteIOContext *pb = s->pb; + AVStream *st = s->streams[pkt->stream_index]; int64_t pos = url_ftell(pb); int padding = 0; gxf_write_packet_header(pb, PKT_MEDIA); - if (sc->codec->codec_id == CODEC_ID_MPEG2VIDEO && pkt->size % 4) /* MPEG-2 frames must be padded */ + if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO && pkt->size % 4) /* MPEG-2 frames must be padded */ padding = 4 - pkt->size % 4; - else if (sc->codec->codec_type == CODEC_TYPE_AUDIO) + else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) padding = GXF_AUDIO_PACKET_SIZE - pkt->size; - gxf_write_media_preamble(pb, ctx, pkt, pkt->size + padding); + gxf_write_media_preamble(s, pkt, pkt->size + padding); put_buffer(pb, pkt->data, pkt->size); gxf_write_padding(pb, padding); - if (sc->codec->codec_type == CODEC_TYPE_VIDEO) - ctx->nb_fields += 2; // count fields + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + if (!(gxf->flt_entries_nb % 500)) { + gxf->flt_entries = av_realloc(gxf->flt_entries, + (gxf->flt_entries_nb+500)*sizeof(*gxf->flt_entries)); + if (!gxf->flt_entries) { + av_log(s, AV_LOG_ERROR, "could not reallocate flt entries\n"); + return -1; + } + } + gxf->flt_entries[gxf->flt_entries_nb++] = url_ftell(pb) / 1024; + gxf->nb_fields += 2; // count fields + } - return updatePacketSize(pb, pos); + updatePacketSize(pb, pos); + + gxf->packet_count++; + if (gxf->packet_count == 100) { + gxf_write_map_packet(s, 0); + gxf->packet_count = 0; + } + + put_flush_packet(pb); + + return 0; } -static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) +static int gxf_compare_field_nb(AVFormatContext *s, AVPacket *next, AVPacket *cur) { GXFContext *gxf = s->priv_data; + AVPacket *pkt[2] = { cur, next }; + int i, field_nb[2]; + GXFStreamContext *sc[2]; + + for (i = 0; i < 2; i++) { + AVStream *st = s->streams[pkt[i]->stream_index]; + sc[i] = st->priv_data; + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + field_nb[i] = av_rescale_rnd(pkt[i]->dts, gxf->time_base.den, + (int64_t)48000*gxf->time_base.num, AV_ROUND_UP); + field_nb[i] &= ~1; // compare against even field number because audio must be before video + } else + field_nb[i] = pkt[i]->dts; // dts are field based + } - gxf_write_media_packet(s->pb, gxf, pkt); - put_flush_packet(s->pb); - return 0; + return field_nb[1] > field_nb[0] || + (field_nb[1] == field_nb[0] && sc[1]->order > sc[0]->order); } static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) { + if (pkt && s->streams[pkt->stream_index]->codec->codec_type == AVMEDIA_TYPE_VIDEO) + pkt->duration = 2; // enforce 2 fields return ff_audio_rechunk_interleave(s, out, pkt, flush, - av_interleave_packet_per_dts, ff_interleave_compare_dts); + av_interleave_packet_per_dts, gxf_compare_field_nb); } AVOutputFormat gxf_muxer = {