On Wed, Apr 04, 2012 at 02:06:42PM +0100, Måns Rullgård wrote:
> Diego Biurrun <[email protected]> writes:
>
> > ---
> > For some reason that I fail to understand this breaks FATE. Since Anton
> > expressed interest in investigating the issue, I rebased the patch on top
> > of HEAD and resent. Of course this is not a submission for inclusion
> > until the problem is found and fixed...
> >
> > --- a/libavcodec/dvdata.h
> > +++ b/libavcodec/dvdata.h
> > @@ -27,11 +27,14 @@
> >
> > +#include <stdint.h>
> > +
> > #include "libavutil/attributes.h"
> > #include "libavutil/rational.h"
> > #include "avcodec.h"
> > #include "dsputil.h"
> > #include "get_bits.h"
> > +#include "dvquant.h"
>
> dvquant.h defines a bunch of static tables which are now duplicated in
> dv.c and dvenc.c. This is not good.
Fixed.
> > @@ -144,6 +148,121 @@ static inline int dv_work_pool_size(const DVprofile
> > *d)
> >
> > +static inline void dv_calc_mb_coordinates(const DVprofile *d, int chan,
> > int seq, int slot,
> > + uint16_t *tbl)
> > +{
> > + static const uint8_t off[] = { 2, 6, 8, 0, 4 };
> > + static const uint8_t shuf1[] = { 36, 18, 54, 0, 72 };
> > + static const uint8_t shuf2[] = { 24, 12, 36, 0, 48 };
> > + static const uint8_t shuf3[] = { 18, 9, 27, 0, 36 };
> > +
> > + static const uint8_t l_start[] = {0, 4, 9, 13, 18, 22, 27, 31, 36, 40};
> > + static const uint8_t l_start_shuffled[] = { 9, 4, 13, 0, 18 };
> > +
> > + static const uint8_t serpent1[] = {0, 1, 2, 2, 1, 0,
> > + 0, 1, 2, 2, 1, 0,
> > + 0, 1, 2, 2, 1, 0,
> > + 0, 1, 2, 2, 1, 0,
> > + 0, 1, 2};
> > + static const uint8_t serpent2[] = {0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0,
> > + 0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0,
> > + 0, 1, 2, 3, 4, 5};
> > +
> > + static const uint8_t remap[][2] = {{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
> > /* dummy */
> > + { 0, 0}, { 0, 1}, { 0, 2}, { 0, 3},
> > {10, 0},
> > + {10, 1}, {10, 2}, {10, 3}, {20, 0},
> > {20, 1},
> > + {20, 2}, {20, 3}, {30, 0}, {30, 1},
> > {30, 2},
> > + {30, 3}, {40, 0}, {40, 1}, {40, 2},
> > {40, 3},
> > + {50, 0}, {50, 1}, {50, 2}, {50, 3},
> > {60, 0},
> > + {60, 1}, {60, 2}, {60, 3}, {70, 0},
> > {70, 1},
> > + {70, 2}, {70, 3}, { 0,64}, { 0,65},
> > { 0,66},
> > + {10,64}, {10,65}, {10,66}, {20,64},
> > {20,65},
> > + {20,66}, {30,64}, {30,65}, {30,66},
> > {40,64},
> > + {40,65}, {40,66}, {50,64}, {50,65},
> > {50,66},
> > + {60,64}, {60,65}, {60,66}, {70,64},
> > {70,65},
> > + {70,66}, { 0,67}, {20,67}, {40,67},
> > {60,67}};
>
> Again, these tables are now duplicated.
Fixed.
> > --- /dev/null
> > +++ b/libavcodec/dvenc.c
>
> [...]
>
> > +#include "dv_tablegen.h"
>
> This is the cause of the failures. You now have two copies of the
> tables, but only one is initialised.
I think I fixed that, but the failures are still there. I'm sending
another RFC patchset with the work I did so far, gotta run now...
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
