parse stream headers for audio streams in mkv, needed for frame size

[ffmpeg] / libavformat / mtv.c

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index ef07e4a3b06646a2bb3c3db386e35b2a0204572d..98c3790d25fa237a51d5c5a2b171910226f988dc 100644 (file)
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/mtv.c
+ * @file
  * MTV demuxer.
  */
 
@@ -40,7 +40,7 @@ typedef struct MTVDemuxContext {
     unsigned int file_size;         ///< filesize, not always right
     unsigned int segments;          ///< number of 512 byte segments
     unsigned int audio_identifier;  ///< 'MP3' on all files I have seen
-    unsigned int audio_br;          ///< bitrate of audio chanel (mp3)
+    unsigned int audio_br;          ///< bitrate of audio channel (mp3)
     unsigned int img_colorfmt;      ///< frame colorfmt rgb 565/555
     unsigned int img_bpp;           ///< frame bits per pixel
     unsigned int img_width;         //
@@ -61,6 +61,18 @@ static int mtv_probe(AVProbeData *p)
     if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
         return 0;
 
+    /* If width or height are 0 then imagesize header field should not */
+    if(!AV_RL16(&p->buf[52]) || !AV_RL16(&p->buf[54]))
+    {
+        if(!!AV_RL16(&p->buf[56]))
+            return AVPROBE_SCORE_MAX/2;
+        else
+            return 0;
+    }
+
+    if(p->buf[51] != 16)
+        return AVPROBE_SCORE_MAX/4; // But we are going to assume 16bpp anyway ..
+
     return AVPROBE_SCORE_MAX;
 }
 
@@ -82,6 +94,17 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
     mtv->img_width         = get_le16(pb);
     mtv->img_height        = get_le16(pb);
     mtv->img_segment_size  = get_le16(pb);
+
+    /* Calculate width and height if missing from header */
+
+    if(!mtv->img_width)
+        mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
+                        / mtv->img_height;
+
+    if(!mtv->img_height)
+        mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
+                        / mtv->img_width;
+
     url_fskip(pb, 4);
     audio_subsegments = get_le16(pb);
     mtv->full_segment_size =
@@ -100,7 +123,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, mtv->video_fps);
-    st->codec->codec_type      = CODEC_TYPE_VIDEO;
+    st->codec->codec_type      = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id        = CODEC_ID_RAWVIDEO;
     st->codec->codec_tag       = MKTAG('R', 'G', 'B', mtv->img_bpp);
     st->codec->width           = mtv->img_width;
@@ -117,7 +140,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
-    st->codec->codec_type      = CODEC_TYPE_AUDIO;
+    st->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id        = CODEC_ID_MP3;
     st->codec->bit_rate        = mtv->audio_br;
     st->need_parsing           = AVSTREAM_PARSE_FULL;
@@ -145,8 +168,8 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
         url_fskip(pb, MTV_AUDIO_PADDING_SIZE);
 
         ret = av_get_packet(pb, pkt, MTV_ASUBCHUNK_DATA_SIZE);
-        if(ret != MTV_ASUBCHUNK_DATA_SIZE)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
         pkt->pos -= MTV_AUDIO_PADDING_SIZE;
         pkt->stream_index = AUDIO_SID;
@@ -154,8 +177,8 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
     }else
     {
         ret = av_get_packet(pb, pkt, mtv->img_segment_size);
-        if(ret != mtv->img_segment_size)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
 #if !HAVE_BIGENDIAN