[FFmpeg-cvslog] dvdec: Fix dvsd profile[1] detection.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  2 05:21:25 2011 +0200| [63d2cfd14250f2a0293cf130f37561b7f2ccf885] | committer: Michael Niedermayer

dvdec: Fix dvsd profile[1] detection.
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63d2cfd14250f2a0293cf130f37561b7f2ccf885
---

 libavcodec/dv.c     |    2 +-
 libavcodec/dvdata.c |   12 +++++++++++-
 libavcodec/dvdata.h |    2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index c616a60..c3cdf9e 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1072,7 +1072,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
     const uint8_t* vsc_pack;
     int apt, is16_9;
 
-    s->sys = ff_dv_frame_profile(s->sys, buf, buf_size);
+    s->sys = ff_dv_frame_profile2(avctx, s->sys, buf, buf_size);
     if (!s->sys || buf_size < s->sys->frame_size || dv_init_dynamic_tables(s->sys)) {
         av_log(avctx, AV_LOG_ERROR, "could not find dv frame profile\n");
         return -1; /* NOTE: we only accept several full frames */
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 05993d8..03e8fcc 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/rational.h"
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "dvdata.h"
 
@@ -245,7 +246,7 @@ static const DVprofile dv_profiles[] = {
     }
 };
 
-const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
+const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sys,
                                   const uint8_t* frame, unsigned buf_size)
 {
    int i;
@@ -259,6 +260,9 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
        return &dv_profiles[2];
    }
 
+   if(codec && codec->codec_tag==AV_RL32("dvsd") &&  codec->width==720 && codec->height==576)
+       return &dv_profiles[1];
+
    for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
        if (dsf == dv_profiles[i].dsf && stype == dv_profiles[i].video_stype)
            return &dv_profiles[i];
@@ -270,6 +274,12 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
    return NULL;
 }
 
+const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
+                                  const uint8_t* frame, unsigned buf_size)
+{
+    return ff_dv_frame_profile2(NULL, sys, frame, buf_size);
+}
+
 const DVprofile* ff_dv_codec_profile(AVCodecContext* codec)
 {
     int i;
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 90f4059..33a5cf1 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -276,6 +276,8 @@ enum dv_pack_type {
 
 const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
                                   const uint8_t* frame, unsigned buf_size);
+const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sys,
+                                  const uint8_t* frame, unsigned buf_size);
 const DVprofile* ff_dv_codec_profile(AVCodecContext* codec);
 
 static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,