simplify

[ffmpeg] / libavformat / nuv.c

diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 74393afaa7059965c48186c81b222bf28603a776..fed0d697779b184f672a7ab3a4c7a987d2a55fb7 100644 (file)
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -1,6 +1,6 @@
 /*
  * NuppelVideo demuxer.
- * Copyright (c) 2006 Reimar Doeffinger.
+ * Copyright (c) 2006 Reimar Doeffinger
  *
  * This file is part of FFmpeg.
  *
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
@@ -33,7 +35,7 @@ typedef enum {
     NUV_AUDIO = 'A',
     NUV_SEEKP = 'R',
     NUV_MYTHEXT = 'X'
-} frametype_t;
+} nuv_frametype;
 
 static int nuv_probe(AVProbeData *p) {
     if (!memcmp(p->buf, "NuppelVideo", 12))
@@ -55,7 +57,7 @@ static int nuv_probe(AVProbeData *p) {
  */
 static int get_codec_data(ByteIOContext *pb, AVStream *vst,
                           AVStream *ast, int myth) {
-    frametype_t frametype;
+    nuv_frametype frametype;
     if (!vst && !myth)
         return 1; // no codec data needed
     while (!url_feof(pb)) {
@@ -93,11 +95,11 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst,
                 if (ast) {
                     ast->codec->codec_tag = get_le32(pb);
                     ast->codec->sample_rate = get_le32(pb);
-                    ast->codec->bits_per_sample = get_le32(pb);
+                    ast->codec->bits_per_coded_sample = get_le32(pb);
                     ast->codec->channels = get_le32(pb);
                     ast->codec->codec_id =
                         wav_codec_get_id(ast->codec->codec_tag,
-                                         ast->codec->bits_per_sample);
+                                         ast->codec->bits_per_coded_sample);
                     ast->need_parsing = AVSTREAM_PARSE_FULL;
                 } else
                     url_fskip(pb, 4 * 4);
@@ -137,6 +139,8 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
     get_byte(pb); // 'P' == progressive, 'I' == interlaced
     url_fskip(pb, 3); // padding
     aspect = av_int2dbl(get_le64(pb));
+    if (aspect > 0.9999 && aspect < 1.0001)
+        aspect = 4.0 / 3.0;
     fps = av_int2dbl(get_le64(pb));
 
     // number of packets per stream type, -1 means unknown, e.g. streaming
@@ -155,8 +159,8 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
         vst->codec->codec_id = CODEC_ID_NUV;
         vst->codec->width = width;
         vst->codec->height = height;
-        vst->codec->bits_per_sample = 10;
-        vst->codec->sample_aspect_ratio = av_d2q(aspect, 10000);
+        vst->codec->bits_per_coded_sample = 10;
+        vst->sample_aspect_ratio = av_d2q(aspect * height / width, 10000);
         vst->r_frame_rate = av_d2q(fps, 60000);
         av_set_pts_info(vst, 32, 1, 1000);
     } else
@@ -173,13 +177,13 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
         ast->codec->sample_rate = 44100;
         ast->codec->bit_rate = 2 * 2 * 44100 * 8;
         ast->codec->block_align = 2 * 2;
-        ast->codec->bits_per_sample = 16;
+        ast->codec->bits_per_coded_sample = 16;
         av_set_pts_info(ast, 32, 1, 1000);
     } else
         ctx->a_id = -1;
 
     get_codec_data(pb, vst, ast, is_mythtv);
-    ctx->rtjpg_video = vst->codec->codec_id == CODEC_ID_NUV;
+    ctx->rtjpg_video = vst && vst->codec->codec_id == CODEC_ID_NUV;
     return 0;
 }
 
@@ -189,7 +193,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
     NUVContext *ctx = s->priv_data;
     ByteIOContext *pb = s->pb;
     uint8_t hdr[HDRSIZE];
-    frametype_t frametype;
+    nuv_frametype frametype;
     int ret, size;
     while (!url_feof(pb)) {
         int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0;