[FFmpeg-devel] [PATCH] Support the ASF_JFIF_Media stream type

[Martin Storsjö]

On Tue, 20 Jul 2010, Michael Niedermayer wrote:

> On Mon, Jul 19, 2010 at 03:07:59PM +0300, Martin Storsj? wrote:
> > Hi,
> > 
> > I've tried to add support for decoding the stream in issue 2070, 
> > rtsp://melpomene.mmedia.upv.es/RETRANS_PR_01. These three patches are 
> > needed for decoding it properly (in addition to a fix to rtpdec_asf, that 
> > I'll send in a separate thread).
> > 
> > The stream header contains a new guid that wasn't supported before, that 
> > according to a little googling is named ASF_JFIF_Media. The stream header 
> > doesn't seem to contain enough data to pose as a normal video stream 
> > header, so the check in patch 3 is necessary to avoid reading bogus data. 
> > Or if we consider this as a completely separate stream type (even if the 
> > type is AVMEDIA_TYPE_VIDEO), we perhaps should check if codec_id == 
> > CODEC_ID_MJPEG and read a different kind of stream header in that case.
> > 
> > // Martin
> >  asf.c |    4 ++++
> >  asf.h |    1 +
> >  2 files changed, 5 insertions(+)
> > d2a7df007862f6497f119ef8ef7c7fbd6a668b1c  0001-asf-Add-asf_jfif_media-guid.patch
> > From 7fc5a6ab44cfa6057514ae38a49cbf40b5aa3547 Mon Sep 17 00:00:00 2001
> > From: Martin Storsjo <martin at martin.st>
> > Date: Fri, 16 Jul 2010 20:21:40 +0300
> > Subject: [PATCH 1/3] asf: Add asf_jfif_media guid
> 
> ok
> [...]
> 
> >  asfdec.c |    3 +++
> >  1 file changed, 3 insertions(+)
> > 4e324bb80b31d8dd7e1394c37ee205c09885bac6  0002-asfdec-Handle-asf_jfif_media.patch
> > From bf179cb70f24e3bd408625e447980d74ae2d33be Mon Sep 17 00:00:00 2001
> > From: Martin Storsjo <martin at martin.st>
> > Date: Mon, 19 Jul 2010 14:31:47 +0300
> > Subject: [PATCH 2/3] asfdec: Handle asf_jfif_media
> 
> ok
> 
> 
> [...]
> >  asfdec.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 679e3dca18d780232f7e58bf5e2536250e5263e0  0003-asfdec-Don-t-read-the-video-stream-header-if-there-i.patch
> > From 060ae03b4fee7c6107a67ad3170e42e5a97c9b09 Mon Sep 17 00:00:00 2001
> > From: Martin Storsjo <martin at martin.st>
> > Date: Mon, 19 Jul 2010 14:32:01 +0300
> > Subject: [PATCH 3/3] asfdec: Don't read the video stream header if there isn't enough data
> 
> 
> ok

Applied - thanks!

// Martin