give AVInput/OutputFormat structs consistent names

[ffmpeg] / libavformat / asf.h

diff --git a/libavformat/asf.h b/libavformat/asf.h
index f66c25b9dc5b9a8c32bdeb625070040ccbd1989c..8dcf7716f173df3911c5a07ad257abf345bd8d16 100644 (file)
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #define PACKET_SIZE 3200
 
@@ -26,12 +26,12 @@ typedef struct {
     int timestamp;
     int64_t duration;
 
-    int ds_span;               /* descrambling  */
+    int ds_span;                /* descrambling  */
     int ds_packet_size;
     int ds_chunk_size;
     int ds_data_size;
     int ds_silence_data;
-    
+
     int packet_pos;
 
 } ASFStream;
@@ -44,39 +44,45 @@ typedef struct {
 } GUID;
 
 typedef struct {
-    GUID guid;                 // generated by client computer
-    uint64_t file_size;                // in bytes
+    GUID guid;                  // generated by client computer
+    uint64_t file_size;         // in bytes
                                 // invalid if broadcasting
-    uint64_t create_time;      // time of creation, in 100-nanosecond units since 1.1.1601
+    uint64_t create_time;       // time of creation, in 100-nanosecond units since 1.1.1601
                                 // invalid if broadcasting
-    uint64_t packets_count;    // how many packets are there in the file
+    uint64_t packets_count;     // how many packets are there in the file
                                 // invalid if broadcasting
-    uint64_t play_time;                // play time, in 100-nanosecond units
+    uint64_t play_time;         // play time, in 100-nanosecond units
                                 // invalid if broadcasting
-    uint64_t send_time;                // time to send file, in 100-nanosecond units
+    uint64_t send_time;         // time to send file, in 100-nanosecond units
                                 // invalid if broadcasting (could be ignored)
-    uint32_t preroll;          // timestamp of the first packet, in milliseconds
-                               // if nonzero - substract from time
+    uint32_t preroll;           // timestamp of the first packet, in milliseconds
+                                // if nonzero - substract from time
     uint32_t ignore;            // preroll is 64bit - but let's just ignore it
-    uint32_t flags;            // 0x01 - broadcast
-                               // 0x02 - seekable
+    uint32_t flags;             // 0x01 - broadcast
+                                // 0x02 - seekable
                                 // rest is reserved should be 0
-    uint32_t min_pktsize;      // size of a data packet
+    uint32_t min_pktsize;       // size of a data packet
                                 // invalid if broadcasting
-    uint32_t max_pktsize;      // shall be the same as for min_pktsize
+    uint32_t max_pktsize;       // shall be the same as for min_pktsize
                                 // invalid if broadcasting
-    uint32_t max_bitrate;      // bandwith of stream in bps
-                               // should be the sum of bitrates of the
+    uint32_t max_bitrate;       // bandwith of stream in bps
+                                // should be the sum of bitrates of the
                                 // individual media streams
 } ASFMainHeader;
 
 
+typedef struct {
+    uint32_t packet_number;
+    uint16_t packet_count;
+} ASFIndex;
+
+
 typedef struct {
     uint32_t seqno;
     unsigned int packet_size;
     int is_streamed;
     int asfid2avid[128];        /* conversion table from asf ID 2 AVStream ID */
-    ASFStream streams[128];    /* it's max number and it's not that big */
+    ASFStream streams[128];     /* it's max number and it's not that big */
     /* non streamed additonnal info */
     int64_t nb_packets;
     int64_t duration; /* in 100ns units */
@@ -114,6 +120,14 @@ typedef struct {
     int packet_pos;
 
     int stream_index;
+
+
+    int64_t last_indexed_pts;
+    ASFIndex* index_ptr;
+    uint32_t nb_index_count;
+    uint32_t nb_index_memory_alloc;
+    uint16_t maximum_packet;
+
     ASFStream* asf_st; /* currently decoded stream */
 } ASFContext;
 
@@ -129,6 +143,10 @@ static const GUID stream_header = {
     0xB7DC0791, 0xA9B7, 0x11CF, { 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 },
 };
 
+static const GUID ext_stream_header = {
+    0x14E6A5CB, 0xC672, 0x4332, { 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A },
+};
+
 static const GUID audio_stream = {
     0xF8699E40, 0x5B4D, 0x11CF, { 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B },
 };
@@ -139,6 +157,10 @@ static const GUID audio_conceal_none = {
     0x20fb5700, 0x5b55, 0x11cf, { 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b },
 };
 
+static const GUID audio_conceal_spread = {
+     0xBFC3CD50, 0x618F, 0x11CF, { 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 },
+};
+
 static const GUID video_stream = {
     0xBC19EFC0, 0x5B4D, 0x11CF, { 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B },
 };
@@ -147,6 +169,9 @@ static const GUID video_conceal_none = {
     0x20FB5700, 0x5B55, 0x11CF, { 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B },
 };
 
+static const GUID command_stream = {
+    0x59DACFC0, 0x59E6, 0x11D0, { 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 },
+};
 
 static const GUID comment_header = {
     0x75b22633, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c },
@@ -175,6 +200,18 @@ static const GUID extended_content_header = {
         0xD2D0A440, 0xE307, 0x11D2, { 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 },
 };
 
+static const GUID simple_index_header = {
+        0x33000890, 0xE5B1, 0x11CF, { 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB },
+};
+
+static const GUID ext_stream_embed_stream_header = {
+        0x3afb65e2, 0x47ef, 0x40f2, { 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43}
+};
+
+static const GUID ext_stream_audio_stream = {
+        0x31178c9d, 0x03e1, 0x4528, { 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03}
+};
+
 /* I am not a number !!! This GUID is the one found on the PC used to
    generate the stream */
 static const GUID my_guid = {