#ifndef AVFORMAT_NUT_H
#define AVFORMAT_NUT_H
-//#include <limits.h>
-//#include "libavutil/adler32.h"
-//#include "libavcodec/mpegaudio.h"
#include "avformat.h"
-#include "riff.h"
+#include "internal.h"
#include "metadata.h"
#define MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
#define MAX_DISTANCE (1024*32-1)
+#define NUT_VERSION 3
+
typedef enum{
FLAG_KEY = 1, ///<if set, frame is keyframe
FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR)
FLAG_INVALID =8192, ///<if set, frame_code is invalid
} Flag;
-typedef struct {
+typedef struct Syncpoint {
uint64_t pos;
uint64_t back_ptr;
// uint64_t global_key_pts;
int64_t ts;
} Syncpoint;
-typedef struct {
+typedef struct FrameCode {
uint16_t flags;
uint8_t stream_id;
uint16_t size_mul;
uint8_t header_idx;
} FrameCode;
-typedef struct {
+typedef struct StreamContext {
int last_flags;
int skip_until_key_frame;
int64_t last_pts;
int decode_delay; //FIXME duplicate of has_b_frames
} StreamContext;
-typedef struct {
+typedef struct ChapterContext {
AVRational *time_base;
} ChapterContext;
-typedef struct {
+typedef struct NUTContext {
AVFormatContext *avf;
// int written_packet_size;
// int64_t packet_start;
extern const AVCodecTag ff_nut_subtitle_tags[];
extern const AVCodecTag ff_nut_video_tags[];
+extern const AVCodecTag ff_nut_audio_tags[];
+extern const AVCodecTag ff_nut_data_tags[];
+
+extern const AVCodecTag * const ff_nut_codec_tags[];
-typedef struct {
+typedef struct Dispositions {
char str[9];
int flag;
} Dispositions;
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b);
int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b);
-void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
+int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
void ff_nut_free_sp(NUTContext *nut);
extern const Dispositions ff_nut_dispositions[];