mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-27 20:01:50 +02:00
dsputil: Move ff_alternate_*_scan tables to mpegvideo
This commit is contained in:
parent
65d5d58658
commit
3832a65901
@ -53,28 +53,6 @@ uint32_t ff_square_tab[512] = { 0, };
|
|||||||
#include "dsputil_template.c"
|
#include "dsputil_template.c"
|
||||||
#include "dsputilenc_template.c"
|
#include "dsputilenc_template.c"
|
||||||
|
|
||||||
const uint8_t ff_alternate_horizontal_scan[64] = {
|
|
||||||
0, 1, 2, 3, 8, 9, 16, 17,
|
|
||||||
10, 11, 4, 5, 6, 7, 15, 14,
|
|
||||||
13, 12, 19, 18, 24, 25, 32, 33,
|
|
||||||
26, 27, 20, 21, 22, 23, 28, 29,
|
|
||||||
30, 31, 34, 35, 40, 41, 48, 49,
|
|
||||||
42, 43, 36, 37, 38, 39, 44, 45,
|
|
||||||
46, 47, 50, 51, 56, 57, 58, 59,
|
|
||||||
52, 53, 54, 55, 60, 61, 62, 63,
|
|
||||||
};
|
|
||||||
|
|
||||||
const uint8_t ff_alternate_vertical_scan[64] = {
|
|
||||||
0, 8, 16, 24, 1, 9, 2, 10,
|
|
||||||
17, 25, 32, 40, 48, 56, 57, 49,
|
|
||||||
41, 33, 26, 18, 3, 11, 4, 12,
|
|
||||||
19, 27, 34, 42, 50, 58, 35, 43,
|
|
||||||
51, 59, 20, 28, 5, 13, 6, 14,
|
|
||||||
21, 29, 36, 44, 52, 60, 37, 45,
|
|
||||||
53, 61, 22, 30, 7, 15, 23, 31,
|
|
||||||
38, 46, 54, 62, 39, 47, 55, 63,
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Input permutation for the simple_idct_mmx */
|
/* Input permutation for the simple_idct_mmx */
|
||||||
static const uint8_t simple_mmx_permutation[64] = {
|
static const uint8_t simple_mmx_permutation[64] = {
|
||||||
0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D,
|
0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D,
|
||||||
|
@ -32,10 +32,6 @@
|
|||||||
|
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
|
|
||||||
/* encoding scans */
|
|
||||||
extern const uint8_t ff_alternate_horizontal_scan[64];
|
|
||||||
extern const uint8_t ff_alternate_vertical_scan[64];
|
|
||||||
|
|
||||||
extern uint32_t ff_square_tab[512];
|
extern uint32_t ff_square_tab[512];
|
||||||
|
|
||||||
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
|
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
|
||||||
|
@ -105,6 +105,28 @@ const uint8_t *const ff_mpeg2_dc_scale_table[4] = {
|
|||||||
mpeg2_dc_scale_table3,
|
mpeg2_dc_scale_table3,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const uint8_t ff_alternate_horizontal_scan[64] = {
|
||||||
|
0, 1, 2, 3, 8, 9, 16, 17,
|
||||||
|
10, 11, 4, 5, 6, 7, 15, 14,
|
||||||
|
13, 12, 19, 18, 24, 25, 32, 33,
|
||||||
|
26, 27, 20, 21, 22, 23, 28, 29,
|
||||||
|
30, 31, 34, 35, 40, 41, 48, 49,
|
||||||
|
42, 43, 36, 37, 38, 39, 44, 45,
|
||||||
|
46, 47, 50, 51, 56, 57, 58, 59,
|
||||||
|
52, 53, 54, 55, 60, 61, 62, 63,
|
||||||
|
};
|
||||||
|
|
||||||
|
const uint8_t ff_alternate_vertical_scan[64] = {
|
||||||
|
0, 8, 16, 24, 1, 9, 2, 10,
|
||||||
|
17, 25, 32, 40, 48, 56, 57, 49,
|
||||||
|
41, 33, 26, 18, 3, 11, 4, 12,
|
||||||
|
19, 27, 34, 42, 50, 58, 35, 43,
|
||||||
|
51, 59, 20, 28, 5, 13, 6, 14,
|
||||||
|
21, 29, 36, 44, 52, 60, 37, 45,
|
||||||
|
53, 61, 22, 30, 7, 15, 23, 31,
|
||||||
|
38, 46, 54, 62, 39, 47, 55, 63,
|
||||||
|
};
|
||||||
|
|
||||||
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
|
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
|
||||||
int16_t *block, int n, int qscale)
|
int16_t *block, int n, int qscale)
|
||||||
{
|
{
|
||||||
|
@ -85,6 +85,10 @@ enum OutputFormat {
|
|||||||
#define EXT_START_CODE 0x000001b5
|
#define EXT_START_CODE 0x000001b5
|
||||||
#define USER_START_CODE 0x000001b2
|
#define USER_START_CODE 0x000001b2
|
||||||
|
|
||||||
|
/* encoding scans */
|
||||||
|
extern const uint8_t ff_alternate_horizontal_scan[64];
|
||||||
|
extern const uint8_t ff_alternate_vertical_scan[64];
|
||||||
|
|
||||||
struct MpegEncContext;
|
struct MpegEncContext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user