Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

[ffmpeg] / libavformat / gdv.c

diff --git a/libavformat/gdv.c b/libavformat/gdv.c
index 87bba2fdbd62e30a1e899ccf79d548a651c4ccb8..a69c349cab3c48abe60ceffd8f804b2a464369e7 100644 (file)
--- a/libavformat/gdv.c
+++ b/libavformat/gdv.c
@@ -42,14 +42,40 @@ static int gdv_read_probe(AVProbeData *p)
     return 0;
 }
 
+static struct {
+    uint16_t id;
+    uint16_t width;
+    uint16_t height;
+} FixedSize[] = {
+    { 0, 320, 200},
+    { 1, 640, 200},
+    { 2, 320, 167},
+    { 3, 320, 180},
+    { 4, 320, 400},
+    { 5, 320, 170},
+    { 6, 160,  85},
+    { 7, 160,  83},
+    { 8, 160,  90},
+    { 9, 280, 128},
+    {10, 320, 240},
+    {11, 320, 201},
+    {16, 640, 400},
+    {17, 640, 200},
+    {18, 640, 180},
+    {19, 640, 167},
+    {20, 640, 170},
+    {21, 320, 240}
+};
+
 static int gdv_read_header(AVFormatContext *ctx)
 {
     GDVContext *gdv = ctx->priv_data;
     AVIOContext *pb = ctx->pb;
     AVStream *vst, *ast;
-    unsigned fps, snd_flags, vid_depth;
+    unsigned fps, snd_flags, vid_depth, size_id;
 
-    avio_skip(pb, 6);
+    avio_skip(pb, 4);
+    size_id = avio_rl16(pb);
 
     vst = avformat_new_stream(ctx, 0);
     if (!vst)
@@ -81,6 +107,8 @@ static int gdv_read_header(AVFormatContext *ctx)
         gdv->audio_size = (ast->codecpar->sample_rate / fps) *
                            ast->codecpar->channels * (1 + !!(snd_flags & 4)) / (1 + !!(snd_flags & 8));
         gdv->is_audio = 1;
+    } else {
+        avio_skip(pb, 2);
     }
     vid_depth = avio_rl16(pb);
     avio_skip(pb, 4);
@@ -91,6 +119,18 @@ static int gdv_read_header(AVFormatContext *ctx)
     vst->codecpar->width      = avio_rl16(pb);
     vst->codecpar->height     = avio_rl16(pb);
 
+    if (vst->codecpar->width == 0 || vst->codecpar->height == 0) {
+        int i;
+
+        for (i = 0; i < FF_ARRAY_ELEMS(FixedSize) - 1; i++) {
+            if (FixedSize[i].id == size_id)
+                break;
+        }
+
+        vst->codecpar->width  = FixedSize[i].width;
+        vst->codecpar->height = FixedSize[i].height;
+    }
+
     avpriv_set_pts_info(vst, 64, 1, fps);
 
     if (vid_depth & 1) {
@@ -100,7 +140,7 @@ static int gdv_read_header(AVFormatContext *ctx)
             unsigned r = avio_r8(pb);
             unsigned g = avio_r8(pb);
             unsigned b = avio_r8(pb);
-            gdv->pal[i] = 0xFF << 24 | r << 18 | g << 10 | b << 2;
+            gdv->pal[i] = 0xFFU << 24 | r << 18 | g << 10 | b << 2;
         }
     }