a2d3511154
Currently, the decoder checks the 128th value of the 4th quant table during
while deriving the context on each sample, in order to speed itself up. This
is due to relying on the behavior of FFmpeg's FFV1 encoder, in which if that
value is zero, the entire 4th and 5th quant tables are assumed to be entirely
zero.
This does not match the FFV1 spec, which has no such restriction, and after
some discussion, it was decided to fix FFmpeg to abide by the spec, rather
than change the spec.
We will now check whether the 4th and 5th quant tables are zero properly,
by checking the 128th valye of both tables (which means they are zero due
to the way they're coded in the bitstream).
For further context, the FFV1 issue in question is located at:
https://github.com/FFmpeg/FFV1/issues/169
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
54 lines
1.8 KiB
C
54 lines
1.8 KiB
C
/*
|
|
* FFV1 codec
|
|
*
|
|
* Copyright (c) 2003-2013 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
static inline int RENAME(predict)(TYPE *src, TYPE *last)
|
|
{
|
|
const int LT = last[-1];
|
|
const int T = last[0];
|
|
const int L = src[-1];
|
|
|
|
return mid_pred(L, L + T - LT, T);
|
|
}
|
|
|
|
static inline int RENAME(get_context)(PlaneContext *p, TYPE *src,
|
|
TYPE *last, TYPE *last2)
|
|
{
|
|
const int LT = last[-1];
|
|
const int T = last[0];
|
|
const int RT = last[1];
|
|
const int L = src[-1];
|
|
|
|
if (p->quant_table[3][127] || p->quant_table[4][127]) {
|
|
const int TT = last2[0];
|
|
const int LL = src[-2];
|
|
return p->quant_table[0][(L - LT) & 0xFF] +
|
|
p->quant_table[1][(LT - T) & 0xFF] +
|
|
p->quant_table[2][(T - RT) & 0xFF] +
|
|
p->quant_table[3][(LL - L) & 0xFF] +
|
|
p->quant_table[4][(TT - T) & 0xFF];
|
|
} else
|
|
return p->quant_table[0][(L - LT) & 0xFF] +
|
|
p->quant_table[1][(LT - T) & 0xFF] +
|
|
p->quant_table[2][(T - RT) & 0xFF];
|
|
}
|
|
|