mirror of https://github.com/FFmpeg/FFmpeg.git
Duplicates of the standard JPEG quantization tables were found in the AGM, MSS34(dsp), NUV and VP31 codecs. This patch elimates those duplicates, placing a single copy in jpegquanttables.c.pull/388/head
Peter Ross
2 years ago
parent
9bed814e1d
commit
58bd7d97a4
9 changed files with 102 additions and 114 deletions
@ -0,0 +1,54 @@ |
||||
/*
|
||||
* MJPEG encoder and decoder |
||||
* Copyright (c) 2000, 2001 Fabrice Bellard |
||||
* Copyright (c) 2003 Alex Beregszaszi |
||||
* Copyright (c) 2003-2004 Michael Niedermayer |
||||
* |
||||
* 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 |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* MJPEG quantization tables |
||||
*/ |
||||
|
||||
#include "jpegquanttables.h" |
||||
|
||||
/* These are the sample quantization tables given in JPEG spec section K.1.
|
||||
* The spec says that the values given produce "good" quality, and |
||||
* when divided by 2, "very good" quality. |
||||
*/ |
||||
const uint8_t ff_mjpeg_std_luminance_quant_tbl[64] = { |
||||
16, 11, 10, 16, 24, 40, 51, 61, |
||||
12, 12, 14, 19, 26, 58, 60, 55, |
||||
14, 13, 16, 24, 40, 57, 69, 56, |
||||
14, 17, 22, 29, 51, 87, 80, 62, |
||||
18, 22, 37, 56, 68, 109, 103, 77, |
||||
24, 35, 55, 64, 81, 104, 113, 92, |
||||
49, 64, 78, 87, 103, 121, 120, 101, |
||||
72, 92, 95, 98, 112, 100, 103, 99 |
||||
}; |
||||
const uint8_t ff_mjpeg_std_chrominance_quant_tbl[64] = { |
||||
17, 18, 24, 47, 99, 99, 99, 99, |
||||
18, 21, 26, 66, 99, 99, 99, 99, |
||||
24, 26, 56, 99, 99, 99, 99, 99, |
||||
47, 66, 99, 99, 99, 99, 99, 99, |
||||
99, 99, 99, 99, 99, 99, 99, 99, |
||||
99, 99, 99, 99, 99, 99, 99, 99, |
||||
99, 99, 99, 99, 99, 99, 99, 99, |
||||
99, 99, 99, 99, 99, 99, 99, 99 |
||||
}; |
||||
@ -0,0 +1,32 @@ |
||||
/*
|
||||
* MJPEG quantization tables |
||||
* |
||||
* 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 |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_JPEGQUANTTABLES_H |
||||
#define AVCODEC_JPEGQUANTTABLES_H |
||||
|
||||
#include <stdint.h> |
||||
#include "libavutil/attributes_internal.h" |
||||
|
||||
FF_VISIBILITY_PUSH_HIDDEN |
||||
extern const uint8_t ff_mjpeg_std_luminance_quant_tbl[64]; |
||||
extern const uint8_t ff_mjpeg_std_chrominance_quant_tbl[64]; |
||||
FF_VISIBILITY_POP_HIDDEN |
||||
|
||||
#endif /* AVCODEC_JPEGQUANTTABLES_H */ |
||||
Loading…
Reference in new issue