X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnut.h;h=6357b3d2b16b8264633cfa3c8152b76145921331;hb=6509012398435252979e149ea4a73438d2107600;hp=943914603585c3c2ce731ba120422f319a2e0c2a;hpb=3b4f69ae8ceac45dd815d26e17d83a7dda4c4057;p=ffmpeg

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 94391460358..6357b3d2b16 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -2,31 +2,29 @@
  * "NUT" Container Format (de)muxer
  * Copyright (c) 2006 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_NUT_H
-#define FFMPEG_NUT_H
+#ifndef AVFORMAT_NUT_H
+#define AVFORMAT_NUT_H
 
-//#include <limits.h>
 #include "avformat.h"
-//#include "mpegaudio.h"
-#include "riff.h"
-//#include "adler32.h"
+#include "internal.h"
+#include "metadata.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
 #define    STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
@@ -38,6 +36,8 @@
 
 #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)
@@ -50,16 +50,16 @@ typedef enum{
     FLAG_MATCH_TIME =2048, ///<If set, match_time_delta is coded in the frame header
     FLAG_CODED      =4096, ///<if set, coded_flags are stored in the frame header
     FLAG_INVALID    =8192, ///<if set, frame_code is invalid
-}flag_t;
+} Flag;
 
-typedef struct {
+typedef struct Syncpoint {
     uint64_t pos;
     uint64_t back_ptr;
 //    uint64_t global_key_pts;
     int64_t ts;
-} syncpoint_t;
+} Syncpoint;
 
-typedef struct {
+typedef struct FrameCode {
     uint16_t flags;
     uint8_t  stream_id;
     uint16_t size_mul;
@@ -67,9 +67,9 @@ typedef struct {
     int16_t  pts_delta;
     uint8_t  reserved_count;
     uint8_t  header_idx;
-} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to Java style but do not mix
+} FrameCode;
 
-typedef struct {
+typedef struct StreamContext {
     int last_flags;
     int skip_until_key_frame;
     int64_t last_pts;
@@ -78,9 +78,13 @@ typedef struct {
     int msb_pts_shift;
     int max_pts_distance;
     int decode_delay; //FIXME duplicate of has_b_frames
-} StreamContext;// maybe s/StreamContext/streamcontext_t/
+} StreamContext;
+
+typedef struct ChapterContext {
+    AVRational *time_base;
+} ChapterContext;
 
-typedef struct {
+typedef struct NUTContext {
     AVFormatContext *avf;
 //    int written_packet_size;
 //    int64_t packet_start;
@@ -89,6 +93,7 @@ typedef struct {
     const uint8_t *header[128];
     uint64_t next_startcode;     ///< stores the next startcode if it has already been parsed but the stream is not seekable
     StreamContext *stream;
+    ChapterContext *chapter;
     unsigned int max_distance;
     unsigned int time_base_count;
     int64_t last_syncpoint_pos;
@@ -97,10 +102,27 @@ typedef struct {
     struct AVTreeNode *syncpoints;
 } NUTContext;
 
+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 Dispositions {
+    char str[9];
+    int flag;
+} Dispositions;
+
 void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
 int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
-int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b);
-int ff_nut_sp_pts_cmp(syncpoint_t *a, syncpoint_t *b);
-void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
+int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b);
+int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b);
+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[];
+
+extern const AVMetadataConv ff_nut_metadata_conv[];
 
-#endif /* FFMPEG_NUT_H */
+#endif /* AVFORMAT_NUT_H */