Check for CONFIG_LIBFOO_DECODER/CONFIG_LIBFOO_ENCODER instead of just

[ffmpeg] / libavformat / mm.c

diff --git a/libavformat/mm.c b/libavformat/mm.c
index a2c8a0c10f77544401e15fbb0752f86370de66cd..6c621ab493cecf12b8c601e7c2edd7cdd7cd77f2 100644 (file)
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file mm.c
+ * @file libavformat/mm.c
  * American Laser Games MM Format Demuxer
  * by Peter Ross (suxen_drol at hotmail dot com)
  *
@@ -31,6 +31,7 @@
  *  http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define MM_PREAMBLE_SIZE    6
@@ -52,7 +53,6 @@
 #define MM_PALETTE_SIZE     (MM_PALETTE_COUNT*3)
 
 typedef struct {
-  AVPaletteControl palette_control;
   unsigned int audio_pts, video_pts;
 } MmDemuxContext;
 
@@ -72,7 +72,7 @@ static int mm_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     MmDemuxContext *mm = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
 
     unsigned int type, length;
@@ -95,20 +95,19 @@ static int mm_read_header(AVFormatContext *s,
     /* video stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     st->codec->codec_type = CODEC_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_MMVIDEO;
     st->codec->codec_tag = 0;  /* no fourcc */
     st->codec->width = width;
     st->codec->height = height;
-    st->codec->palctrl = &mm->palette_control;
     av_set_pts_info(st, 64, 1, frame_rate);
 
     /* audio stream */
     if (length == MM_HEADER_LEN_AV) {
         st = av_new_stream(s, 0);
         if (!st)
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
         st->codec->codec_type = CODEC_TYPE_AUDIO;
         st->codec->codec_tag = 0; /* no fourcc */
         st->codec->codec_id = CODEC_ID_PCM_U8;
@@ -117,7 +116,6 @@ static int mm_read_header(AVFormatContext *s,
         av_set_pts_info(st, 64, 1, 8000); /* 8000 hz */
     }
 
-    mm->palette_control.palette_changed = 0;
     mm->audio_pts = 0;
     mm->video_pts = 0;
     return 0;
@@ -127,16 +125,14 @@ static int mm_read_packet(AVFormatContext *s,
                            AVPacket *pkt)
 {
     MmDemuxContext *mm = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned char preamble[MM_PREAMBLE_SIZE];
-    unsigned char pal[MM_PALETTE_SIZE];
     unsigned int type, length;
-    int i;
 
     while(1) {
 
         if (get_buffer(pb, preamble, MM_PREAMBLE_SIZE) != MM_PREAMBLE_SIZE) {
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
 
         type = AV_RL16(&preamble[0]);
@@ -144,22 +140,6 @@ static int mm_read_packet(AVFormatContext *s,
 
         switch(type) {
         case MM_TYPE_PALETTE :
-            url_fseek(pb, 4, SEEK_CUR);  /* unknown data */
-            if (get_buffer(pb, pal, MM_PALETTE_SIZE) != MM_PALETTE_SIZE)
-                return AVERROR_IO;
-            url_fseek(pb, length - (4 + MM_PALETTE_SIZE), SEEK_CUR);
-
-            for (i=0; i<MM_PALETTE_COUNT; i++) {
-                int r = pal[i*3 + 0];
-                int g = pal[i*3 + 1];
-                int b = pal[i*3 + 2];
-                mm->palette_control.palette[i] = (r << 16) | (g << 8) | (b);
-                /* repeat palette, where each components is multiplied by four */
-                mm->palette_control.palette[i+128] = (r << 18) | (g << 10) | (b<<2);
-            }
-            mm->palette_control.palette_changed = 1;
-            break;
-
         case MM_TYPE_INTER :
         case MM_TYPE_INTRA :
         case MM_TYPE_INTRA_HH :
@@ -168,25 +148,27 @@ static int mm_read_packet(AVFormatContext *s,
         case MM_TYPE_INTER_HHV :
             /* output preamble + data */
             if (av_new_packet(pkt, length + MM_PREAMBLE_SIZE))
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE);
             if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length)
-                return AVERROR_IO;
+                return AVERROR(EIO);
             pkt->size = length + MM_PREAMBLE_SIZE;
             pkt->stream_index = 0;
-            pkt->pts = mm->video_pts++;
+            pkt->pts = mm->video_pts;
+            if (type!=MM_TYPE_PALETTE)
+                mm->video_pts++;
             return 0;
 
         case MM_TYPE_AUDIO :
-            if (av_get_packet(&s->pb, pkt, length)<0)
-                return AVERROR_NOMEM;
+            if (av_get_packet(s->pb, pkt, length)<0)
+                return AVERROR(ENOMEM);
             pkt->size = length;
             pkt->stream_index = 1;
             pkt->pts = mm->audio_pts++;
             return 0;
 
         default :
-            av_log(NULL, AV_LOG_INFO, "mm: unknown chunk type 0x%x\n", type);
+            av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type);
             url_fseek(pb, length, SEEK_CUR);
         }
     }
@@ -194,17 +176,11 @@ static int mm_read_packet(AVFormatContext *s,
     return 0;
 }
 
-static int mm_read_close(AVFormatContext *s)
-{
-    return 0;
-}
-
 AVInputFormat mm_demuxer = {
     "mm",
-    "American Laser Games MM format",
+    NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
     sizeof(MmDemuxContext),
     mm_probe,
     mm_read_header,
     mm_read_packet,
-    mm_read_close,
 };