mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-08 06:09:50 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: avcodec: Bump minor for JPEG 2000 decoder JPEG 2000 decoder for DCinema The mqc code is merged, the rest is added independent of the existing jpeg2000 decoder and encoder. Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/mqc.c libavcodec/mqc.h libavcodec/mqcdec.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
e2e9bee2da
14 changed files with 2635 additions and 87 deletions
136
libavcodec/mqc.c
136
libavcodec/mqc.c
|
|
@ -20,89 +20,93 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* MQ-coder ecoder and decoder common functions
|
||||
* MQ-coder common (decoder/encoder) functions
|
||||
* @file
|
||||
* @author Kamil Nowosad
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "mqc.h"
|
||||
|
||||
typedef struct {
|
||||
uint16_t qe;
|
||||
uint8_t nmps;
|
||||
uint8_t nlps;
|
||||
uint8_t sw;
|
||||
/* MQ coder context state structure */
|
||||
typedef struct MqcCxState {
|
||||
uint16_t qe;
|
||||
uint8_t nmps;
|
||||
uint8_t nlps;
|
||||
uint8_t sw;
|
||||
} MqcCxState;
|
||||
|
||||
const static MqcCxState cx_states[47] = {
|
||||
{0x5601, 1, 1, 1},
|
||||
{0x3401, 2, 6, 0},
|
||||
{0x1801, 3, 9, 0},
|
||||
{0x0AC1, 4, 12, 0},
|
||||
{0x0521, 5, 29, 0},
|
||||
{0x0221, 38, 33, 0},
|
||||
{0x5601, 7, 6, 1},
|
||||
{0x5401, 8, 14, 0},
|
||||
{0x4801, 9, 14, 0},
|
||||
{0x3801, 10, 14, 0},
|
||||
{0x3001, 11, 17, 0},
|
||||
{0x2401, 12, 18, 0},
|
||||
{0x1C01, 13, 20, 0},
|
||||
{0x1601, 29, 21, 0},
|
||||
{0x5601, 15, 14, 1},
|
||||
{0x5401, 16, 14, 0},
|
||||
{0x5101, 17, 15, 0},
|
||||
{0x4801, 18, 16, 0},
|
||||
{0x3801, 19, 17, 0},
|
||||
{0x3401, 20, 18, 0},
|
||||
{0x3001, 21, 19, 0},
|
||||
{0x2801, 22, 19, 0},
|
||||
{0x2401, 23, 20, 0},
|
||||
{0x2201, 24, 21, 0},
|
||||
{0x1C01, 25, 22, 0},
|
||||
{0x1801, 26, 23, 0},
|
||||
{0x1601, 27, 24, 0},
|
||||
{0x1401, 28, 25, 0},
|
||||
{0x1201, 29, 26, 0},
|
||||
{0x1101, 30, 27, 0},
|
||||
{0x0AC1, 31, 28, 0},
|
||||
{0x09C1, 32, 29, 0},
|
||||
{0x08A1, 33, 30, 0},
|
||||
{0x0521, 34, 31, 0},
|
||||
{0x0441, 35, 32, 0},
|
||||
{0x02A1, 36, 33, 0},
|
||||
{0x0221, 37, 34, 0},
|
||||
{0x0141, 38, 35, 0},
|
||||
{0x0111, 39, 36, 0},
|
||||
{0x0085, 40, 37, 0},
|
||||
{0x0049, 41, 38, 0},
|
||||
{0x0025, 42, 39, 0},
|
||||
{0x0015, 43, 40, 0},
|
||||
{0x0009, 44, 41, 0},
|
||||
{0x0005, 45, 42, 0},
|
||||
{0x0001, 45, 43, 0},
|
||||
{0x5601, 46, 46, 0}
|
||||
static const MqcCxState cx_states[47] = {
|
||||
{ 0x5601, 1, 1, 1 },
|
||||
{ 0x3401, 2, 6, 0 },
|
||||
{ 0x1801, 3, 9, 0 },
|
||||
{ 0x0AC1, 4, 12, 0 },
|
||||
{ 0x0521, 5, 29, 0 },
|
||||
{ 0x0221, 38, 33, 0 },
|
||||
{ 0x5601, 7, 6, 1 },
|
||||
{ 0x5401, 8, 14, 0 },
|
||||
{ 0x4801, 9, 14, 0 },
|
||||
{ 0x3801, 10, 14, 0 },
|
||||
{ 0x3001, 11, 17, 0 },
|
||||
{ 0x2401, 12, 18, 0 },
|
||||
{ 0x1C01, 13, 20, 0 },
|
||||
{ 0x1601, 29, 21, 0 },
|
||||
{ 0x5601, 15, 14, 1 },
|
||||
{ 0x5401, 16, 14, 0 },
|
||||
{ 0x5101, 17, 15, 0 },
|
||||
{ 0x4801, 18, 16, 0 },
|
||||
{ 0x3801, 19, 17, 0 },
|
||||
{ 0x3401, 20, 18, 0 },
|
||||
{ 0x3001, 21, 19, 0 },
|
||||
{ 0x2801, 22, 19, 0 },
|
||||
{ 0x2401, 23, 20, 0 },
|
||||
{ 0x2201, 24, 21, 0 },
|
||||
{ 0x1C01, 25, 22, 0 },
|
||||
{ 0x1801, 26, 23, 0 },
|
||||
{ 0x1601, 27, 24, 0 },
|
||||
{ 0x1401, 28, 25, 0 },
|
||||
{ 0x1201, 29, 26, 0 },
|
||||
{ 0x1101, 30, 27, 0 },
|
||||
{ 0x0AC1, 31, 28, 0 },
|
||||
{ 0x09C1, 32, 29, 0 },
|
||||
{ 0x08A1, 33, 30, 0 },
|
||||
{ 0x0521, 34, 31, 0 },
|
||||
{ 0x0441, 35, 32, 0 },
|
||||
{ 0x02A1, 36, 33, 0 },
|
||||
{ 0x0221, 37, 34, 0 },
|
||||
{ 0x0141, 38, 35, 0 },
|
||||
{ 0x0111, 39, 36, 0 },
|
||||
{ 0x0085, 40, 37, 0 },
|
||||
{ 0x0049, 41, 38, 0 },
|
||||
{ 0x0025, 42, 39, 0 },
|
||||
{ 0x0015, 43, 40, 0 },
|
||||
{ 0x0009, 44, 41, 0 },
|
||||
{ 0x0005, 45, 42, 0 },
|
||||
{ 0x0001, 45, 43, 0 },
|
||||
{ 0x5601, 46, 46, 0 }
|
||||
};
|
||||
|
||||
uint16_t ff_mqc_qe [2*47];
|
||||
uint8_t ff_mqc_nlps[2*47];
|
||||
uint8_t ff_mqc_nmps[2*47];
|
||||
uint16_t ff_mqc_qe [2 * 47];
|
||||
uint8_t ff_mqc_nlps[2 * 47];
|
||||
uint8_t ff_mqc_nmps[2 * 47];
|
||||
|
||||
void ff_mqc_init_contexts(MqcState *mqc)
|
||||
{
|
||||
int i;
|
||||
memset(mqc->cx_states, 0, sizeof(mqc->cx_states));
|
||||
mqc->cx_states[MQC_CX_UNI] = 2 * 46;
|
||||
mqc->cx_states[MQC_CX_RL] = 2 * 3;
|
||||
mqc->cx_states[0] = 2 * 4;
|
||||
mqc->cx_states[MQC_CX_RL] = 2 * 3;
|
||||
mqc->cx_states[0] = 2 * 4;
|
||||
|
||||
for (i = 0; i < 47; i++){
|
||||
ff_mqc_qe[2*i ] =
|
||||
ff_mqc_qe[2*i+1] = cx_states[i].qe;
|
||||
for (i = 0; i < 47; i++) {
|
||||
ff_mqc_qe[2 * i] =
|
||||
ff_mqc_qe[2 * i + 1] = cx_states[i].qe;
|
||||
|
||||
ff_mqc_nlps[2*i ] = 2*cx_states[i].nlps + cx_states[i].sw;
|
||||
ff_mqc_nlps[2*i+1] = 2*cx_states[i].nlps + 1 - cx_states[i].sw;
|
||||
ff_mqc_nmps[2*i ] = 2*cx_states[i].nmps;
|
||||
ff_mqc_nmps[2*i+1] = 2*cx_states[i].nmps + 1;
|
||||
ff_mqc_nlps[2 * i] = 2 * cx_states[i].nlps + cx_states[i].sw;
|
||||
ff_mqc_nlps[2 * i + 1] = 2 * cx_states[i].nlps + 1 - cx_states[i].sw;
|
||||
ff_mqc_nmps[2 * i] = 2 * cx_states[i].nmps;
|
||||
ff_mqc_nmps[2 * i + 1] = 2 * cx_states[i].nmps + 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue