segfault fix

[ffmpeg] / libavformat / idcin.c

diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 6125c64afcbd445ce7d6e464ccd48b8244efd13c..164cf556c6c26559fe17f2b650891c36a00a35d2 100644 (file)
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -68,12 +68,6 @@
 
 #include "avformat.h"
 
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
-                   (((uint8_t*)(x))[2] << 16) | \
-                   (((uint8_t*)(x))[1] << 8) | \
-                    ((uint8_t*)(x))[0])
-
 #define HUFFMAN_TABLE_SIZE (64 * 1024)
 #define FRAME_PTS_INC (90000 / 14)
 
@@ -90,8 +84,7 @@ typedef struct IdcinDemuxContext {
 
     int64_t pts;
 
-    /* keep reference to extradata but never free it */
-    void *extradata;
+    AVPaletteControl palctrl;
 } IdcinDemuxContext;
 
 static int idcin_probe(AVProbeData *p)
@@ -161,6 +154,7 @@ static int idcin_read_header(AVFormatContext *s,
     st = av_new_stream(s, 0);
     if (!st)
         return AVERROR_NOMEM;
+    av_set_pts_info(st, 33, 1, 90000);
     idcin->video_stream_index = st->index;
     st->codec.codec_type = CODEC_TYPE_VIDEO;
     st->codec.codec_id = CODEC_ID_IDCIN;
@@ -173,9 +167,9 @@ static int idcin_read_header(AVFormatContext *s,
     st->codec.extradata = av_malloc(HUFFMAN_TABLE_SIZE);
     if (get_buffer(pb, st->codec.extradata, HUFFMAN_TABLE_SIZE) !=
         HUFFMAN_TABLE_SIZE)
-        return -EIO;
+        return AVERROR_IO;
     /* save a reference in order to transport the palette */
-    idcin->extradata = st->codec.extradata;
+    st->codec.palctrl = &idcin->palctrl;
 
     /* if sample rate is 0, assume no audio */
     if (sample_rate) {
@@ -183,6 +177,7 @@ static int idcin_read_header(AVFormatContext *s,
         st = av_new_stream(s, 0);
         if (!st)
             return AVERROR_NOMEM;
+        av_set_pts_info(st, 33, 1, 90000);
         idcin->audio_stream_index = st->index;
         st->codec.codec_type = CODEC_TYPE_AUDIO;
         st->codec.codec_tag = 1;
@@ -212,10 +207,6 @@ static int idcin_read_header(AVFormatContext *s,
     idcin->next_chunk_is_video = 1;
     idcin->pts = 0;
 
-    /* set the pts reference (1 pts = 1/90000) */
-    s->pts_num = 1;
-    s->pts_den = 90000;
-
     return 0;
 }
 
@@ -227,33 +218,37 @@ static int idcin_read_packet(AVFormatContext *s,
     unsigned int chunk_size;
     IdcinDemuxContext *idcin = (IdcinDemuxContext *)s->priv_data;
     ByteIOContext *pb = &s->pb;
-    AVPaletteControl *palette_control = (AVPaletteControl *)idcin->extradata;
     int i;
     int palette_scale;
+    unsigned char r, g, b;
+    unsigned char palette_buffer[768];
 
     if (url_feof(&s->pb))
-        return -EIO;
+        return AVERROR_IO;
 
     if (idcin->next_chunk_is_video) {
         command = get_le32(pb);
         if (command == 2) {
-            return -EIO;
+            return AVERROR_IO;
         } else if (command == 1) {
             /* trigger a palette change */
-            palette_control->palette_changed = 1;
-            if (get_buffer(pb, palette_control->palette, 768) != 768)
-                return -EIO;
+            idcin->palctrl.palette_changed = 1;
+            if (get_buffer(pb, palette_buffer, 768) != 768)
+                return AVERROR_IO;
             /* scale the palette as necessary */
             palette_scale = 2;
             for (i = 0; i < 768; i++)
-                if (palette_control->palette[i] > 63) {
+                if (palette_buffer[i] > 63) {
                     palette_scale = 0;
                     break;
                 }
 
-            if (palette_scale)
-                for (i = 0; i < 768; i++)
-                    palette_control->palette[i] <<= palette_scale;
+            for (i = 0; i < 256; i++) {
+                r = palette_buffer[i * 3    ] << palette_scale;
+                g = palette_buffer[i * 3 + 1] << palette_scale;
+                b = palette_buffer[i * 3 + 2] << palette_scale;
+                idcin->palctrl.palette[i] = (r << 16) | (g << 8) | (b);
+            }
         }
 
         chunk_size = get_le32(pb);
@@ -261,12 +256,12 @@ static int idcin_read_packet(AVFormatContext *s,
         url_fseek(pb, 4, SEEK_CUR);
         chunk_size -= 4;
         if (av_new_packet(pkt, chunk_size))
-            ret = -EIO;
+            ret = AVERROR_IO;
         pkt->stream_index = idcin->video_stream_index;
         pkt->pts = idcin->pts;
         ret = get_buffer(pb, pkt->data, chunk_size);
         if (ret != chunk_size)
-            ret = -EIO;
+            ret = AVERROR_IO;
     } else {
         /* send out the audio chunk */
         if (idcin->current_audio_chunk)
@@ -274,12 +269,12 @@ static int idcin_read_packet(AVFormatContext *s,
         else
             chunk_size = idcin->audio_chunk_size1;
         if (av_new_packet(pkt, chunk_size))
-            return -EIO;
+            return AVERROR_IO;
         pkt->stream_index = idcin->audio_stream_index;
         pkt->pts = idcin->pts;
         ret = get_buffer(&s->pb, pkt->data, chunk_size);
         if (ret != chunk_size)
-            ret = -EIO;
+            ret = AVERROR_IO;
 
         idcin->current_audio_chunk ^= 1;
         idcin->pts += FRAME_PTS_INC;
@@ -293,6 +288,7 @@ static int idcin_read_packet(AVFormatContext *s,
 
 static int idcin_read_close(AVFormatContext *s)
 {
+
     return 0;
 }