virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

dvdec: Fix dvsd profile[1] detection.

Browse Source 
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-02 05:21:25 +02:00
parent fea20d1ddc
commit 63d2cfd142
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dv.c
View File

@ -1072,7 +1072,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
const uint8_t* vsc_pack; const uint8_t* vsc_pack;
int apt, is16_9; 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)) { 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"); av_log(avctx, AV_LOG_ERROR, "could not find dv frame profile\n");
return -1; /* NOTE: we only accept several full frames */ return -1; /* NOTE: we only accept several full frames */

12
libavcodec/dvdata.c
View File

@ -25,6 +25,7 @@
*/ */
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "dvdata.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) const uint8_t* frame, unsigned buf_size)
{ {
int i; int i;
@ -259,6 +260,9 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
return &dv_profiles[2]; 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++) for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
if (dsf == dv_profiles[i].dsf && stype == dv_profiles[i].video_stype) if (dsf == dv_profiles[i].dsf && stype == dv_profiles[i].video_stype)
return &dv_profiles[i]; return &dv_profiles[i];
@ -270,6 +274,12 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
return NULL; 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) const DVprofile* ff_dv_codec_profile(AVCodecContext* codec)
{ {
int i; int i;

2
libavcodec/dvdata.h
View File

@ -276,6 +276,8 @@ enum dv_pack_type {
const DVprofile* ff_dv_frame_profile(const DVprofile *sys, const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
const uint8_t* frame, unsigned buf_size); 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); const DVprofile* ff_dv_codec_profile(AVCodecContext* codec);
static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num, static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num,