[libav-devel] [PATCH] MS Screen 1 decoder

2012-06-16 Thread Kostya Shishkov
--- As a side note, I must say that lavf ASF demuxer outputs wrong data, so for example eleventh or twelfth frame in http://samples.ffmpeg.org/V-codecs/MSS1/screen_codec.wmv is demuxed wrong compared to MPlayer. And of course it causes decoding errors. As a second side note, I heard that MSS2 (aka

[libav-devel] [PATCH] MS Screen 1 decoder

2012-06-19 Thread Kostya Shishkov
--- Updated codec name(s) to be slightly less confusing. Maybe it will get a proper review this time... --- Changelog |1 + doc/general.texi |2 + libavcodec/Makefile|1 + libavcodec/allcodecs.c |1 + libavcodec/avcodec.h |1 + libavcodec/mss1.c |

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-17 Thread Diego Biurrun
On Sat, Jun 16, 2012 at 12:36:16PM +0200, Kostya Shishkov wrote: > --- > As a side note, I must say that lavf ASF demuxer outputs wrong data, so for > example eleventh or twelfth frame in > http://samples.ffmpeg.org/V-codecs/MSS1/screen_codec.wmv > is demuxed wrong compared to MPlayer. And of cours

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-17 Thread Kostya Shishkov
On Sun, Jun 17, 2012 at 03:01:40PM +0200, Diego Biurrun wrote: > On Sat, Jun 16, 2012 at 12:36:16PM +0200, Kostya Shishkov wrote: > > --- > > As a side note, I must say that lavf ASF demuxer outputs wrong data, so for > > example eleventh or twelfth frame in > > http://samples.ffmpeg.org/V-codecs/M

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-17 Thread Diego Biurrun
On Sun, Jun 17, 2012 at 04:54:36PM +0200, Kostya Shishkov wrote: > On Sun, Jun 17, 2012 at 03:01:40PM +0200, Diego Biurrun wrote: > > On Sat, Jun 16, 2012 at 12:36:16PM +0200, Kostya Shishkov wrote: > > > +static int arith_get_bit(ArithCoder *c) > > > +{ > > > +int range = c->high - c->low + 1;

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Martin Storsjö
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c new file mode 100644 index 000..ba1a613 --- /dev/null +++ b/libavcodec/mss1.c @@ -0,0 +1,846 @@ +/* + * Microsoft Screen 1 (aka Windows Media Video V7 Screen) decoder + * Copyright (c) 2012 Konstantin Shishkov + * + * This file is part of Liba

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Kostya Shishkov
On Mon, Jun 18, 2012 at 04:48:43PM +0300, Martin Storsjö wrote: > >diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c > >new file mode 100644 > >index 000..ba1a613 > >--- /dev/null > >+++ b/libavcodec/mss1.c > >@@ -0,0 +1,846 @@ > >+/* > >+ * Microsoft Screen 1 (aka Windows Media Video V7 Scree

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Christophe Gisquet
Hi, > +typedef struct Model { > +    int cum_prob[MODEL_MAX_SYMS + 1]; > +    int weights[MODEL_MAX_SYMS + 1]; > +    int idx2sym[MODEL_MAX_SYMS + 1]; > +    int sym2idx[MODEL_MAX_SYMS + 1]; > +    int num_syms; > +    int thr_weight, threshold; > +} Model; How high are the weights typically? Sam

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Kostya Shishkov
On Mon, Jun 18, 2012 at 04:16:01PM +0200, Christophe Gisquet wrote: > Hi, > > > +typedef struct Model { > > +    int cum_prob[MODEL_MAX_SYMS + 1]; > > +    int weights[MODEL_MAX_SYMS + 1]; > > +    int idx2sym[MODEL_MAX_SYMS + 1]; > > +    int sym2idx[MODEL_MAX_SYMS + 1]; > > +    int num_syms; >

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Christophe Gisquet
2012/6/18 Kostya Shishkov : >> How high are the weights typically? Same for the LUT values of idx2sym >> and sym2idx. num_syms seems to be set to 8 or 2, but there is probably >> something I missed in between. > > There's one model for all pixel values (i.e. 256 symbols). > Original decoder can hav

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-18 Thread Kostya Shishkov
On Mon, Jun 18, 2012 at 04:34:04PM +0200, Christophe Gisquet wrote: > 2012/6/18 Kostya Shishkov : > >> How high are the weights typically? Same for the LUT values of idx2sym > >> and sym2idx. num_syms seems to be set to 8 or 2, but there is probably > >> something I missed in between. > > > > There

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-20 Thread Kostya Shishkov
On Tue, Jun 19, 2012 at 06:33:14PM +0200, Kostya Shishkov wrote: > --- > Updated codec name(s) to be slightly less confusing. > Maybe it will get a proper review this time... > --- > Changelog |1 + > doc/general.texi |2 + > libavcodec/Makefile|1 + > libavcodec

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-20 Thread Benjamin Larsson
On 06/19/2012 06:33 PM, Kostya Shishkov wrote: --- Updated codec name(s) to be slightly less confusing. Maybe it will get a proper review this time... --- LGTM MvH Benjamin Larsson ___ libav-devel mailing list libav-devel@libav.org https://lists.liba

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-20 Thread Derek Buitenhuis
> +#define MODEL_MIN_SYMS 2 > +#define MODEL_MAX_SYMS 256 y u no align? > +#define THRESH_ADAPTIVE -1 > +#define THRESH_LOW 15 > +#define THRESH_HIGH 50 > +#define THRESH_KOSTYA 1985 Will this be in the final push? I don't actually see it being used anywhere. :P > +static int arith_get

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-20 Thread Kostya Shishkov
On Wed, Jun 20, 2012 at 11:24:21AM -0400, Derek Buitenhuis wrote: > > +#define MODEL_MIN_SYMS 2 > > +#define MODEL_MAX_SYMS 256 > > y u no align? It is, just on left edge ;) I'll realign before committing > > +#define THRESH_ADAPTIVE -1 > > +#define THRESH_LOW 15 > > +#define THRESH_HIGH

Re: [libav-devel] [PATCH] MS Screen 1 decoder

2012-06-20 Thread Kostya Shishkov
On Wed, Jun 20, 2012 at 04:46:58PM +0200, Benjamin Larsson wrote: > On 06/19/2012 06:33 PM, Kostya Shishkov wrote: > >--- > >Updated codec name(s) to be slightly less confusing. > >Maybe it will get a proper review this time... > >--- > > LGTM Applied (with some nits from Derek fixed) ___