Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Michael Niedermayer
On Wed, Dec 17, 2014 at 12:04:37PM +0100, Thomas Volkert wrote: > From: Thomas Volkert > > --- > Changelog | 1 + > libavformat/act.c | 2 +- > libavformat/asfdec.c | 2 +- > libavformat/avidec.c | 2 +- > libavformat/dxa.c | 2 +- > libavformat/mat

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Thomas Volkert
On 12/17/2014 10:57 PM, Benoit Fouet wrote: Hi, Le 17/12/2014 22:15, Reimar Döffinger a écrit : On Wed, Dec 17, 2014 at 11:55:17AM +0100, Thomas Volkert wrote: On 12/16/2014 08:36 AM, Reimar Döffinger wrote: On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: codec->samp

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Benoit Fouet
Hi, Le 17/12/2014 22:15, Reimar Döffinger a écrit : On Wed, Dec 17, 2014 at 11:55:17AM +0100, Thomas Volkert wrote: On 12/16/2014 08:36 AM, Reimar Döffinger wrote: On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: codec->sample_rate = avio_rl32(pb); codec->bit_ra

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Reimar Döffinger
On Wed, Dec 17, 2014 at 11:55:17AM +0100, Thomas Volkert wrote: > On 12/16/2014 08:36 AM, Reimar Döffinger wrote: > >On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: > >>> codec->sample_rate = avio_rl32(pb); > >>> codec->bit_rate= avio_rl32(pb) * 8; > >>> code

[FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Thomas Volkert
From: Thomas Volkert --- Changelog | 1 + libavformat/act.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dxa.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mlvdec.c | 2 +- libavformat/mov.c |

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Thomas Volkert
On 12/16/2014 08:36 AM, Reimar Döffinger wrote: On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: codec->sample_rate = avio_rl32(pb); codec->bit_rate= avio_rl32(pb) * 8; codec->block_align = avio_rl16(pb); +if (big_endian) { +id

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > -id = avio_rl16(pb); > codec->codec_type = AVMEDIA_TYPE_AUDIO; > -codec->channels= avio_rl16(pb); > -codec->sample_rate = avio_rl32(pb); > -codec->bit_rate= avio_rl32(pb) * 8; > -codec->block_align = avio_rl16(pb)

[FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Thomas Volkert
From: Thomas Volkert --- Changelog | 1 + libavformat/act.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dxa.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mlvdec.c | 2 +- libavformat/mov.c |

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-17 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX */ > -int cbSize = avio_rl16(pb); /* cbSize */ > +int cbSize = (!big_endian ? avio_rl16(pb) : > avio_rb16(pb)); /* cbSize */ This change looks useless to me given that you erro

[FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-16 Thread Thomas Volkert
From: Thomas Volkert --- Changelog | 1 + libavformat/act.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dxa.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mlvdec.c | 2 +- libavformat/mov.c |

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Reimar Döffinger
On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: > Thomas Volkert gmx.net> writes: > > > +#include > > This will hopefully be unneeded. > > > codec->sample_rate = avio_rl32(pb); > > codec->bit_rate= avio_rl32(pb) * 8; > > codec->block_align = avio_rl16(pb

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread compn
On Mon, 15 Dec 2014 11:10:08 +0100 Thomas Volkert wrote: > +if (big_endian) { > +id = ntohs(id); > +codec->channels= ntohs(codec->channels); > +codec->sample_rate = ntohl(codec->sample_rate); > +codec->bit_rate= ntohl(codec->bit_rate / 8

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > >>if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX > >> +if (big_endian) > >> +avpriv_report_missing_feature(codec, > >> "WAVEFORMATEX support for RIFX files\n"); > > Is this sufficient, no further error handling needed? > > I do n

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Thomas Volkert
On 12/15/2014 11:24 AM, Carl Eugen Hoyos wrote: Thomas Volkert gmx.net> writes: +#include This will hopefully be unneeded. Okay, this will simplify the patch. if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX */ +if (big_endian) +avpriv_report_mi

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > +#include This will hopefully be unneeded. > codec->sample_rate = avio_rl32(pb); > codec->bit_rate= avio_rl32(pb) * 8; > codec->block_align = avio_rl16(pb); > +if (big_endian) { > +id = ntohs(id); > +co

[FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Thomas Volkert
This fixes ticket #1978. From: Thomas Volkert --- Changelog | 1 + libavformat/act.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dxa.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mlvdec.c | 2 +-