Changeset 254

Timestamp:

Oct 10, 2006, 9:02:55 PM (18 years ago)

Author:

vladest

Message:

Added missed files
Deleted unneeded files
Fixed timestamps in real streams

Location:

trunk

Files:

• libavcodec/common.h (deleted)
• libavcodec/vorbis_data.c (added)
• libavutil/common.h (added)
• libmpdemux/demux_mkv.c (modified) (21 diffs)
• libmpdemux/demux_real.c (modified) (17 diffs)

trunk/libmpdemux/demux_mkv.c ¶

@@ -267 +267 @@
 extern int demux_aid_vid_mismatch;
 
+/**
+ * \brief ensures there is space for at least one additional element
+ * \param array array to grow
+ * \param nelem current number of elements in array
+ * \param elsize size of one array element
+ */
+static void grow_array(void **array, int nelem, size_t elsize) {
+    if (!(nelem & 31))
+        *array = realloc(*array, (nelem + 32) * elsize);
+}
 
 static mkv_track_t *
@@ -310 +320 @@
             return;
 
-    if (!mkv_d->cluster_positions)
-        mkv_d->cluster_positions = (uint64_t *) malloc (32 * sizeof (uint64_t));
-    else if (!(mkv_d->num_cluster_pos % 32))
-        mkv_d->cluster_positions = (uint64_t *) realloc(mkv_d->cluster_positions,
-                                                        (mkv_d->num_cluster_pos+32)
-                                                        * sizeof (uint64_t));
+    grow_array(&mkv_d->cluster_positions, mkv_d->num_cluster_pos,
+               sizeof(uint64_t));
     mkv_d->cluster_positions[mkv_d->num_cluster_pos++] = position;
 }
@@ -698 +704 @@
 }
 
+/**
+ * \brief free array of kv_content_encoding_t
+ * \param encodings pointer to array
+ * \param numencodings number of encodings in array
+ */
+static void
+demux_mkv_free_encodings(mkv_content_encoding_t *encodings, int numencodings)
+{
+    while (numencodings-- > 0)
+        free(encodings[numencodings].comp_settings);
+    free(encodings);
+}
+
 static int
 demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
@@ -736 +755 @@
                         num = ebml_read_uint (s, &l);
                         if (num == EBML_UINT_INVALID)
-                            return 0;
+                            goto err_out;
                         e.order = num;
                         break;
@@ -743 +762 @@
                         num = ebml_read_uint (s, &l);
                         if (num == EBML_UINT_INVALID)
-                            return 0;
+                            goto err_out;
                         e.scope = num;
                         break;
@@ -750 +769 @@
                         num = ebml_read_uint (s, &l);
                         if (num == EBML_UINT_INVALID)
-                            return 0;
+                            goto err_out;
                         e.type = num;
                         break;
@@ -771 +790 @@
                                     num = ebml_read_uint (s, &l);
                                     if (num == EBML_UINT_INVALID)
-                                        return 0;
+                                        goto err_out;
                                     e.comp_algo = num;
                                     break;
@@ -853 +872 @@
     track->num_encodings = n;
     return len;
+
+err_out:
+    demux_mkv_free_encodings(ce, n);
+    return 0;
 }
 
@@ -992 +1015 @@
 }
 
+/**
+ * \brief free any data associated with given track
+ * \param track track of which to free data
+ */
+static void
+demux_mkv_free_trackentry(mkv_track_t *track) {
+    if (track->name)
+        free (track->name);
+    if (track->codec_id)
+        free (track->codec_id);
+    if (track->language)
+        free (track->language);
+    if (track->private_data)
+        free (track->private_data);
+    if (track->audio_buf)
+        free (track->audio_buf);
+    if (track->audio_timestamp)
+        free (track->audio_timestamp);
+#ifdef USE_ASS
+    if (track->sh_sub.ass_track)
+        ass_free_track (track->sh_sub.ass_track);
+#endif
+    demux_mkv_free_encodings(track->encodings, track->num_encodings);
+    free(track);
+}
+
 static int
 demux_mkv_read_trackentry (demuxer_t *demuxer)
@@ -1017 +1066 @@
                 uint64_t num = ebml_read_uint (s, &l);
                 if (num == EBML_UINT_INVALID)
-                    return 0;
+                    goto err_out;
                 track->tnum = num;
                 dprintf ("[mkv] |  + Track number: %u\n",
@@ -1053 +1102 @@
             l = demux_mkv_read_trackaudio (demuxer, track);
             if (l == 0)
-                return 0;
+                goto err_out;
             break;
 
@@ -1060 +1109 @@
             l = demux_mkv_read_trackvideo (demuxer, track);
             if (l == 0)
-                return 0;
+                goto err_out;
             break;
 
@@ -1066 +1115 @@
             track->codec_id = ebml_read_ascii (s, &l);
             if (track->codec_id == NULL)
-                return 0;
+                goto err_out;
             if (!strcmp (track->codec_id, MKV_V_MSCOMP) ||
                 !strcmp (track->codec_id, MKV_A_ACM))
@@ -1098 +1147 @@
                 track->private_data = malloc (num);
                 if (stream_read(s, track->private_data, num) != (int) num)
-                    return 0;
+                    goto err_out;
                 track->private_size = num;
                 dprintf ("[mkv] |  + CodecPrivate, length "
@@ -1106 +1155 @@
 
         case MATROSKA_ID_TRACKLANGUAGE:
+            free(track->language);
             track->language = ebml_read_utf8 (s, &l);
             if (track->language == NULL)
-                return 0;
+                goto err_out;
             dprintf ("[mkv] |  + Language: %s\n",
                      track->language);
@@ -1117 +1167 @@
                 uint64_t num = ebml_read_uint (s, &l);
                 if (num == EBML_UINT_INVALID)
-                    return 0;
+                    goto err_out;
                 track->default_track = num;
                 dprintf ("[mkv] |  + Default flag: %u\n",
@@ -1128 +1178 @@
                 uint64_t num = ebml_read_uint (s, &l);
                 if (num == EBML_UINT_INVALID)
-                    return 0;
+                    goto err_out;
                 if (num == 0)
                     dprintf ("[mkv] |  + Default duration: 0");
@@ -1144 +1194 @@
             l = demux_mkv_read_trackencodings (demuxer, track);
             if (l == 0)
-                return 0;
+                goto err_out;
             break;
 
@@ -1156 +1206 @@
     mkv_d->tracks[mkv_d->num_tracks++] = track;
     return len;
+
+err_out:
+    demux_mkv_free_trackentry(track);
+    return 0;
 }
 
@@ -1291 +1345 @@
             && pos != EBML_UINT_INVALID)
         {
-            if (mkv_d->indexes == NULL)
-                mkv_d->indexes = (mkv_index_t *) malloc (32*sizeof (mkv_index_t));
-            else if (mkv_d->num_indexes % 32 == 0)
-                mkv_d->indexes = (mkv_index_t *) realloc (mkv_d->indexes,
-                                                          (mkv_d->num_indexes+32)
-                                                          *sizeof (mkv_index_t));
+            grow_array(&mkv_d->indexes, mkv_d->num_indexes, sizeof(mkv_index_t));
             mkv_d->indexes[mkv_d->num_indexes].tnum = track;
             mkv_d->indexes[mkv_d->num_indexes].timecode = time;
@@ -2486 +2535 @@
         {
             for (i=0; i<mkv_d->num_tracks; i++)
-            {
-                if (mkv_d->tracks[i]->codec_id)
-                    free (mkv_d->tracks[i]->codec_id);
-                if (mkv_d->tracks[i]->language)
-                    free (mkv_d->tracks[i]->language);
-                if (mkv_d->tracks[i]->private_data)
-                    free (mkv_d->tracks[i]->private_data);
-                if (mkv_d->tracks[i]->audio_buf)
-                    free (mkv_d->tracks[i]->audio_buf);
-                if (mkv_d->tracks[i]->audio_timestamp)
-                    free (mkv_d->tracks[i]->audio_timestamp);
-            }
+                demux_mkv_free_trackentry(mkv_d->tracks[i]);
             for (i=0; i < SUB_MAX_TEXT; i++)
                 if (mkv_d->subs.text[i])

trunk/libmpdemux/demux_real.c ¶

@@ -69 +69 @@
 extern int verbose;
 typedef struct {
-    int         timestamp;
+    unsigned int        timestamp;
     int         offset;
     //    int           packetno;
@@ -94 +94 @@
 
     // timestamp correction:
-    int         kf_base;// timestamp of the prev. video keyframe
-    int         kf_pts; // timestamp of next video keyframe
-    int         a_pts;  // previous audio timestamp
-    float       v_pts;  // previous video timestamp
+    unsigned int         kf_base;// timestamp of the prev. video keyframe
+    unsigned int                kf_pts; // timestamp of next video keyframe
+    unsigned int                a_pts;  // previous audio timestamp
+    double      v_pts;  // previous video timestamp
     unsigned long duration;
 
@@ -128 +128 @@
     int audiopk_size[MAX_STREAMS]; ///< audio packet size
     unsigned char *audio_buf; ///< place to store reordered audio data
-    float *audio_timestamp; ///< timestamp for each audio packet
+    double *audio_timestamp; ///< timestamp for each audio packet
     int sub_packet_cnt; ///< number of subpacket already received
     int audio_filepos; ///< file position of first audio packet in block
@@ -187 +187 @@
     {
 #if 1
-        printf("i: %d, pos: %d, timestamp: %d\n", i, index[i].offset, index[i].timestamp);
+        dprintf("i: %d, pos: %d, timestamp: %u\n", i, index[i].offset, index[i].timestamp);
 #else
         dprintf("packetno: %x pos: %x len: %x timestamp: %x flags: %x\n",
@@ -275 +275 @@
 
 #if 1
-static void add_index_item(demuxer_t *demuxer, int stream_id, int timestamp, int offset)
+static void add_index_item(demuxer_t *demuxer, int stream_id, unsigned int timestamp, int offset)
 {
     if ((unsigned)stream_id < MAX_STREAMS)
@@ -310 +310 @@
 }
 
-static void add_index_segment(demuxer_t *demuxer, int seek_stream_id, int seek_timestamp)
+static void add_index_segment(demuxer_t *demuxer, int seek_stream_id, int64_t seek_timestamp)
 {
-    int tag, len, stream_id, timestamp, flags;
+    int tag, len, stream_id, flags;
+    unsigned int timestamp;
     if (seek_timestamp != -1 && (unsigned)seek_stream_id >= MAX_STREAMS)
         return;
@@ -346 +347 @@
             }
         }
-        // printf("Index: stream=%d packet=%d timestamp=%d len=%d flags=0x%x datapos=0x%x\n", stream_id, entries, timestamp, len, flags, index->offset);
+        // printf("Index: stream=%d packet=%d timestamp=%u len=%d flags=0x%x datapos=0x%x\n", stream_id, entries, timestamp, len, flags, index->offset);
         /* skip data */
         stream_skip(demuxer->stream, len-12);
@@ -392 +393 @@
     int num_of_packets = 0;
     int i, entries = 0;
-    int len, stream_id = 0, timestamp, flags;
+    int len, stream_id = 0, flags;
+    unsigned int timestamp;
     int tab_pos = 0;
 
@@ -502 +504 @@
 #define SHOW_BITS(n) ((buffer)>>(32-(n)))
 
-static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, float frametime, unsigned int format){
-    float v_pts;
+static double real_fix_timestamp(real_priv_t* priv, unsigned char* s, unsigned int timestamp, double frametime, unsigned int format){
+    double v_pts;
     uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3];
-    int kf=timestamp;
+    unsigned int kf=timestamp;
     int pict_type;
-    int orig_kf;
+    unsigned int orig_kf;
 
 #if 1
@@ -532 +534 @@
         } else {
             // P/B frame, merge timestamps:
-            int tmp=timestamp-priv->kf_base;
+            int64_t tmp=(int64_t)timestamp-priv->kf_base;
             kf|=tmp&(~0x1fff);        // combine with packet timestamp
             if(kf<tmp-4096) kf+=8192; else // workaround wrap-around problems
@@ -539 +541 @@
         }
         if(pict_type != 3){ // P || I  frame -> swap timestamps
-            int tmp=kf;
+            unsigned int tmp=kf;
             kf=priv->kf_pts;
             priv->kf_pts=tmp;
             //  if(kf<=tmp) kf=0;
         }
-        if(verbose>1) printf("\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5d\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],kf-(int)(1000.0*priv->v_pts));
+        dprintf("\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5u\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],kf-(unsigned int)(1000.0*priv->v_pts));
     }
 #endif
@@ -568 +570 @@
     demux_stream_t *ds = NULL;
     int len;
-    int timestamp;
+    unsigned int timestamp;
     int stream_id;
 #ifdef CRACK_MATRIX
@@ -650 +652 @@
 
         dprintf("len:%d\n", len);
-        dprintf("\npacket#%d: pos: 0x%0x, len: %d, id: %d, pts: %d, flags: %x rvd:%d\n",
+        dprintf("\npacket#%d: pos: 0x%0x, len: %d, id: %d, pts: %u, flags: %x rvd:%d\n",
                 priv->current_packet, (int)demuxer->filepos, len, stream_id, timestamp, flags, reserved);
 
@@ -1060 +1062 @@
                 demuxer->audio->sh=sh;
                 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
-                priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(float));
+                priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
                 dprintf("Auto-selected RM audio ID = %d\n",stream_id);
                 goto got_audio;
@@ -1482 +1484 @@
                                 demuxer->audio->sh=sh;
                                 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
-                                priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(float));
+                                priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
                             }
 
@@ -1836 +1838 @@
     int vid = d_video->id, aid = d_audio->id;
     int next_offset = 0;
-    int cur_timestamp = 0;
+    int64_t cur_timestamp = 0;
     int streams = 0;
     int retried = 0;
@@ -1920 +1922 @@
 {
     real_priv_t *priv = demuxer->priv;
-    int lastpts = priv->v_pts ? priv->v_pts : priv->a_pts;
+    unsigned int lastpts = priv->v_pts ? priv->v_pts : priv->a_pts;
 
     switch (cmd) {