Skip to content

F
ffmpeg.wasm-core
Commit 10b9c374 authored by Kostya Shishkov's avatar Kostya Shishkov
Browse files
Options

Rename VC9 to VC1 as there is no such thing as VC9 

Originally committed as revision 5529 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f33aa120
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 211 deletions
libavcodec/Makefile
View file @ 10b9c374
...@@ -194,8 +194,8 @@ endif ...@@ -194,8 +194,8 @@ endif
ifeq ($(CONFIG_ULTI_DECODER),yes) ifeq ($(CONFIG_ULTI_DECODER),yes)
OBJS+= ulti.o OBJS+= ulti.o
endif endif
ifneq ($(CONFIG_VC9_DECODER)$(CONFIG_WMV3_DECODER),) ifneq ($(CONFIG_VC1_DECODER)$(CONFIG_WMV3_DECODER),)
OBJS+= vc9.o OBJS+= vc1.o
endif endif
ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),) ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
OBJS+= vcr1.o OBJS+= vcr1.o
......
libavcodec/allcodecs.c
View file @ 10b9c374
...@@ -226,9 +226,9 @@ void avcodec_register_all(void) ...@@ -226,9 +226,9 @@ void avcodec_register_all(void)
#ifdef CONFIG_WMV2_DECODER #ifdef CONFIG_WMV2_DECODER
register_avcodec(&wmv2_decoder); register_avcodec(&wmv2_decoder);
#endif //CONFIG_WMV2_DECODER #endif //CONFIG_WMV2_DECODER
#ifdef CONFIG_VC9_DECODER #ifdef CONFIG_VC1_DECODER
register_avcodec(&vc9_decoder); register_avcodec(&vc1_decoder);
#endif //CONFIG_VC9_DECODER #endif //CONFIG_VC1_DECODER
/* Reenable when it stops crashing on every file, causing bug report spam. /* Reenable when it stops crashing on every file, causing bug report spam.
#ifdef CONFIG_WMV3_DECODER #ifdef CONFIG_WMV3_DECODER
register_avcodec(&wmv3_decoder); register_avcodec(&wmv3_decoder);
......
libavcodec/avcodec.h
View file @ 10b9c374
...@@ -101,7 +101,7 @@ enum CodecID { ...@@ -101,7 +101,7 @@ enum CodecID {
CODEC_ID_FFVHUFF, CODEC_ID_FFVHUFF,
CODEC_ID_RV30, CODEC_ID_RV30,
CODEC_ID_RV40, CODEC_ID_RV40,
CODEC_ID_VC9, CODEC_ID_VC1,
CODEC_ID_WMV3, CODEC_ID_WMV3,
CODEC_ID_LOCO, CODEC_ID_LOCO,
CODEC_ID_WNV1, CODEC_ID_WNV1,
...@@ -2112,7 +2112,7 @@ extern AVCodec msmpeg4v2_decoder; ...@@ -2112,7 +2112,7 @@ extern AVCodec msmpeg4v2_decoder;
extern AVCodec msmpeg4v3_decoder; extern AVCodec msmpeg4v3_decoder;
extern AVCodec wmv1_decoder; extern AVCodec wmv1_decoder;
extern AVCodec wmv2_decoder; extern AVCodec wmv2_decoder;
extern AVCodec vc9_decoder; extern AVCodec vc1_decoder;
extern AVCodec wmv3_decoder; extern AVCodec wmv3_decoder;
extern AVCodec mpeg1video_decoder; extern AVCodec mpeg1video_decoder;
extern AVCodec mpeg2video_decoder; extern AVCodec mpeg2video_decoder;
......
libavcodec/msmpeg4.c
View file @ 10b9c374
...@@ -75,7 +75,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); ...@@ -75,7 +75,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
/* vc9 externs */ /* vc1 externs */
extern uint8_t wmv3_dc_scale_table[32]; extern uint8_t wmv3_dc_scale_table[32];
#ifdef DEBUG #ifdef DEBUG
...@@ -177,7 +177,7 @@ static void common_init(MpegEncContext * s) ...@@ -177,7 +177,7 @@ static void common_init(MpegEncContext * s)
s->y_dc_scale_table= wmv1_y_dc_scale_table; s->y_dc_scale_table= wmv1_y_dc_scale_table;
s->c_dc_scale_table= wmv1_c_dc_scale_table; s->c_dc_scale_table= wmv1_c_dc_scale_table;
break; break;
#if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC9_DECODER) #if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC1_DECODER)
case 6: case 6:
s->y_dc_scale_table= wmv3_dc_scale_table; s->y_dc_scale_table= wmv3_dc_scale_table;
s->c_dc_scale_table= wmv3_dc_scale_table; s->c_dc_scale_table= wmv3_dc_scale_table;
...@@ -1197,7 +1197,7 @@ int ff_msmpeg4_decode_init(MpegEncContext *s) ...@@ -1197,7 +1197,7 @@ int ff_msmpeg4_decode_init(MpegEncContext *s)
case 5: case 5:
s->decode_mb= wmv2_decode_mb; s->decode_mb= wmv2_decode_mb;
case 6: case 6:
//FIXME + TODO VC9 decode mb //FIXME + TODO VC1 decode mb
break; break;
} }
......
libavcodec/vc9.c → libavcodec/vc1.c
View file @ 10b9c374
This diff is collapsed.
libavcodec/vc9data.h → libavcodec/vc1data.h
View file @ 10b9c374
/** /**
* @file vc9data.h * @file vc1data.h
* VC9 tables. * VC1 tables.
*/ */
#ifndef VC9DATA_H #ifndef VC1DATA_H
#define VC9DATA_H #define VC1DATA_H
/* bfraction is fractional, we scale to the GCD 3*5*7*8 = 840 */ /* bfraction is fractional, we scale to the GCD 3*5*7*8 = 840 */
const int16_t vc9_bfraction_lut[23] = { const int16_t vc1_bfraction_lut[23] = {
420 /*1/2*/, 280 /*1/3*/, 560 /*2/3*/, 210 /*1/4*/, 420 /*1/2*/, 280 /*1/3*/, 560 /*2/3*/, 210 /*1/4*/,
630 /*3/4*/, 168 /*1/5*/, 336 /*2/5*/, 630 /*3/4*/, 168 /*1/5*/, 336 /*2/5*/,
504 /*3/5*/, 672 /*4/5*/, 140 /*1/6*/, 700 /*5/6*/, 504 /*3/5*/, 672 /*4/5*/, 140 /*1/6*/, 700 /*5/6*/,
...@@ -16,7 +16,7 @@ const int16_t vc9_bfraction_lut[23] = { ...@@ -16,7 +16,7 @@ const int16_t vc9_bfraction_lut[23] = {
525 /*5/8*/, 735 /*7/8*/, 525 /*5/8*/, 735 /*7/8*/,
-1 /*inv.*/, 0 /*BI fm*/ -1 /*inv.*/, 0 /*BI fm*/
}; };
const uint8_t vc9_bfraction_bits[23] = { const uint8_t vc1_bfraction_bits[23] = {
3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3,
7, 7, 7, 7, 7, 7, 7, 7,
...@@ -25,7 +25,7 @@ const uint8_t vc9_bfraction_bits[23] = { ...@@ -25,7 +25,7 @@ const uint8_t vc9_bfraction_bits[23] = {
7, 7, 7, 7,
7, 7 7, 7
}; };
const uint8_t vc9_bfraction_codes[23] = { const uint8_t vc1_bfraction_codes[23] = {
0, 1, 2, 3, 0, 1, 2, 3,
4, 5, 6, 4, 5, 6,
112, 113, 114, 115, 112, 113, 114, 115,
...@@ -36,7 +36,7 @@ const uint8_t vc9_bfraction_codes[23] = { ...@@ -36,7 +36,7 @@ const uint8_t vc9_bfraction_codes[23] = {
}; };
//Same as H.264 //Same as H.264
static const AVRational vc9_pixel_aspect[16]={ static const AVRational vc1_pixel_aspect[16]={
{0, 1}, {0, 1},
{1, 1}, {1, 1},
{12, 11}, {12, 11},
...@@ -56,36 +56,36 @@ static const AVRational vc9_pixel_aspect[16]={ ...@@ -56,36 +56,36 @@ static const AVRational vc9_pixel_aspect[16]={
}; };
/* BitPlane IMODE - such a small table... */ /* BitPlane IMODE - such a small table... */
static const uint8_t vc9_imode_codes[7] = { static const uint8_t vc1_imode_codes[7] = {
0, 2, 1, 3, 1, 2, 3 0, 2, 1, 3, 1, 2, 3
}; };
static const uint8_t vc9_imode_bits[7] = { static const uint8_t vc1_imode_bits[7] = {
4, 2, 3, 2, 4, 3, 3 4, 2, 3, 2, 4, 3, 3
}; };
/* Normal-2 imode */ /* Normal-2 imode */
static const uint8_t vc9_norm2_codes[4] = { static const uint8_t vc1_norm2_codes[4] = {
0, 4, 5, 3 0, 4, 5, 3
}; };
static const uint8_t vc9_norm2_bits[4] = { static const uint8_t vc1_norm2_bits[4] = {
1, 3, 3, 2 1, 3, 3, 2
}; };
static const uint16_t vc9_norm6_codes[64] = { static const uint16_t vc1_norm6_codes[64] = {
0x001, 0x002, 0x003, 0x000, 0x004, 0x001, 0x002, 0x047, 0x005, 0x003, 0x004, 0x04B, 0x005, 0x04D, 0x04E, 0x30E, 0x001, 0x002, 0x003, 0x000, 0x004, 0x001, 0x002, 0x047, 0x005, 0x003, 0x004, 0x04B, 0x005, 0x04D, 0x04E, 0x30E,
0x006, 0x006, 0x007, 0x053, 0x008, 0x055, 0x056, 0x30D, 0x009, 0x059, 0x05A, 0x30C, 0x05C, 0x30B, 0x30A, 0x037, 0x006, 0x006, 0x007, 0x053, 0x008, 0x055, 0x056, 0x30D, 0x009, 0x059, 0x05A, 0x30C, 0x05C, 0x30B, 0x30A, 0x037,
0x007, 0x00A, 0x00B, 0x043, 0x00C, 0x045, 0x046, 0x309, 0x00D, 0x049, 0x04A, 0x308, 0x04C, 0x307, 0x306, 0x036, 0x007, 0x00A, 0x00B, 0x043, 0x00C, 0x045, 0x046, 0x309, 0x00D, 0x049, 0x04A, 0x308, 0x04C, 0x307, 0x306, 0x036,
0x00E, 0x051, 0x052, 0x305, 0x054, 0x304, 0x303, 0x035, 0x058, 0x302, 0x301, 0x034, 0x300, 0x033, 0x032, 0x007, 0x00E, 0x051, 0x052, 0x305, 0x054, 0x304, 0x303, 0x035, 0x058, 0x302, 0x301, 0x034, 0x300, 0x033, 0x032, 0x007,
}; };
static const uint8_t vc9_norm6_bits[64] = { static const uint8_t vc1_norm6_bits[64] = {
1, 4, 4, 8, 4, 8, 8, 10, 4, 8, 8, 10, 8, 10, 10, 13, 1, 4, 4, 8, 4, 8, 8, 10, 4, 8, 8, 10, 8, 10, 10, 13,
4, 8, 8, 10, 8, 10, 10, 13, 8, 10, 10, 13, 10, 13, 13, 9, 4, 8, 8, 10, 8, 10, 10, 13, 8, 10, 10, 13, 10, 13, 13, 9,
4, 8, 8, 10, 8, 10, 10, 13, 8, 10, 10, 13, 10, 13, 13, 9, 4, 8, 8, 10, 8, 10, 10, 13, 8, 10, 10, 13, 10, 13, 13, 9,
8, 10, 10, 13, 10, 13, 13, 9, 10, 13, 13, 9, 13, 9, 9, 6, 8, 10, 10, 13, 10, 13, 13, 9, 10, 13, 13, 9, 13, 9, 9, 6,
}; };
/* Normal-6 imode */ /* Normal-6 imode */
static const uint8_t vc9_norm6_spec[64][5] = { static const uint8_t vc1_norm6_spec[64][5] = {
{ 0, 1, 1 }, { 0, 1, 1 },
{ 1, 2, 4 }, { 1, 2, 4 },
{ 2, 3, 4 }, { 2, 3, 4 },
...@@ -153,13 +153,13 @@ static const uint8_t vc9_norm6_spec[64][5] = { ...@@ -153,13 +153,13 @@ static const uint8_t vc9_norm6_spec[64][5] = {
}; };
/* 4MV Block pattern VLC tables */ /* 4MV Block pattern VLC tables */
static const uint8_t vc9_4mv_block_pattern_codes[4][16] = { static const uint8_t vc1_4mv_block_pattern_codes[4][16] = {
{ 14, 58, 59, 25, 12, 26, 15, 15, 13, 24, 27, 0, 28, 1, 2, 2}, { 14, 58, 59, 25, 12, 26, 15, 15, 13, 24, 27, 0, 28, 1, 2, 2},
{ 8, 18, 19, 4, 20, 5, 30, 11, 21, 31, 6, 12, 7, 13, 14, 0}, { 8, 18, 19, 4, 20, 5, 30, 11, 21, 31, 6, 12, 7, 13, 14, 0},
{ 15, 6, 7, 2, 8, 3, 28, 9, 10, 29, 4, 11, 5, 12, 13, 0}, { 15, 6, 7, 2, 8, 3, 28, 9, 10, 29, 4, 11, 5, 12, 13, 0},
{ 0, 11, 12, 4, 13, 5, 30, 16, 14, 31, 6, 17, 7, 18, 19, 19} { 0, 11, 12, 4, 13, 5, 30, 16, 14, 31, 6, 17, 7, 18, 19, 19}
}; };
static const uint8_t vc9_4mv_block_pattern_bits[4][16] = { static const uint8_t vc1_4mv_block_pattern_bits[4][16] = {
{ 5, 6, 6, 5, 5, 5, 5, 4, 5, 5, 5, 3, 5, 3, 3, 2}, { 5, 6, 6, 5, 5, 5, 5, 4, 5, 5, 5, 3, 5, 3, 3, 2},
{ 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 4, 4, 4, 4, 4, 2}, { 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 4, 4, 4, 4, 4, 2},
{ 4, 4, 4, 4, 4, 4, 5, 4, 4, 5, 4, 4, 4, 4, 4, 3}, { 4, 4, 4, 4, 4, 4, 5, 4, 4, 5, 4, 4, 4, 4, 4, 3},
...@@ -171,7 +171,7 @@ const uint8_t wmv3_dc_scale_table[32]={ ...@@ -171,7 +171,7 @@ const uint8_t wmv3_dc_scale_table[32]={
}; };
/* P-Picture CBPCY VLC tables */ /* P-Picture CBPCY VLC tables */
static const uint16_t vc9_cbpcy_p_codes[4][64] = { static const uint16_t vc1_cbpcy_p_codes[4][64] = {
{ {
0, 1, 1, 4, 5, 1, 12, 4, 13, 14, 10, 11, 12, 7, 13, 2, 0, 1, 1, 4, 5, 1, 12, 4, 13, 14, 10, 11, 12, 7, 13, 2,
15, 1, 96, 1, 49, 97, 2, 100, 3, 4, 5, 101, 102, 52, 53, 4, 15, 1, 96, 1, 49, 97, 2, 100, 3, 4, 5, 101, 102, 52, 53, 4,
...@@ -197,7 +197,7 @@ static const uint16_t vc9_cbpcy_p_codes[4][64] = { ...@@ -197,7 +197,7 @@ static const uint16_t vc9_cbpcy_p_codes[4][64] = {
44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 28, 29, 30, 31 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 28, 29, 30, 31
} }
}; };
static const uint8_t vc9_cbpcy_p_bits[4][64] = { static const uint8_t vc1_cbpcy_p_bits[4][64] = {
{ {
13, 6, 5, 6, 6, 7, 7, 5, 7, 7, 6, 6, 6, 5, 6, 3, 13, 6, 5, 6, 6, 7, 7, 5, 7, 7, 6, 6, 6, 5, 6, 3,
7, 8, 8, 13, 7, 8, 13, 8, 13, 13, 13, 8, 8, 7, 7, 3, 7, 8, 8, 13, 7, 8, 13, 8, 13, 13, 13, 8, 8, 7, 7, 3,
...@@ -232,7 +232,7 @@ static const uint8_t vc9_cbpcy_p_bits[4][64] = { ...@@ -232,7 +232,7 @@ static const uint8_t vc9_cbpcy_p_bits[4][64] = {
* 8x4:MB:btm 8x4:MB:top 8x4,MB,both * 8x4:MB:btm 8x4:MB:top 8x4,MB,both
* 4x8,MB,right 4x8,MB,left * 4x8,MB,right 4x8,MB,left
* 4x4,MB */ * 4x4,MB */
static const uint16_t vc9_ttmb_codes[3][16] = { static const uint16_t vc1_ttmb_codes[3][16] = {
{ {
0x0003, 0x0003,
0x002E, 0x005F, 0x0000, 0x002E, 0x005F, 0x0000,
...@@ -262,7 +262,7 @@ static const uint16_t vc9_ttmb_codes[3][16] = { ...@@ -262,7 +262,7 @@ static const uint16_t vc9_ttmb_codes[3][16] = {
} }
}; };
static const uint8_t vc9_ttmb_bits[3][16] = { static const uint8_t vc1_ttmb_bits[3][16] = {
{ {
2, 2,
6, 7, 2, 6, 7, 2,
...@@ -293,31 +293,31 @@ static const uint8_t vc9_ttmb_bits[3][16] = { ...@@ -293,31 +293,31 @@ static const uint8_t vc9_ttmb_bits[3][16] = {
}; };
/* TTBLK (Transform Type per Block) tables */ /* TTBLK (Transform Type per Block) tables */
static const uint8_t vc9_ttblk_codes[3][8] = { static const uint8_t vc1_ttblk_codes[3][8] = {
{ 0, 1, 3, 5, 16, 17, 18, 19}, { 0, 1, 3, 5, 16, 17, 18, 19},
{ 3, 0, 1, 2, 3, 5, 8, 9}, { 3, 0, 1, 2, 3, 5, 8, 9},
{ 1, 0, 1, 4, 6, 7, 10, 11} { 1, 0, 1, 4, 6, 7, 10, 11}
}; };
static const uint8_t vc9_ttblk_bits[3][8] = { static const uint8_t vc1_ttblk_bits[3][8] = {
{ 2, 2, 2, 3, 5, 5, 5, 5}, { 2, 2, 2, 3, 5, 5, 5, 5},
{ 2, 3, 3, 3, 3, 3, 4, 4}, { 2, 3, 3, 3, 3, 3, 4, 4},
{ 2, 3, 3, 3, 3, 3, 4, 4} { 2, 3, 3, 3, 3, 3, 4, 4}
}; };
/* SUBBLKPAT tables, p93-94, reordered */ /* SUBBLKPAT tables, p93-94, reordered */
static const uint8_t vc9_subblkpat_codes[3][15] = { static const uint8_t vc1_subblkpat_codes[3][15] = {
{ 14, 12, 7, 11, 9, 26, 2, 10, 27, 8, 0, 6, 1, 15, 1}, { 14, 12, 7, 11, 9, 26, 2, 10, 27, 8, 0, 6, 1, 15, 1},
{ 14, 0, 8, 15, 10, 4, 23, 13, 5, 9, 25, 3, 24, 22, 1}, { 14, 0, 8, 15, 10, 4, 23, 13, 5, 9, 25, 3, 24, 22, 1},
{ 5, 6, 2, 2, 8, 0, 28, 3, 1, 3, 29, 1, 19, 18, 15} { 5, 6, 2, 2, 8, 0, 28, 3, 1, 3, 29, 1, 19, 18, 15}
}; };
static const uint8_t vc9_subblkpat_bits[3][15] = { static const uint8_t vc1_subblkpat_bits[3][15] = {
{ 5, 5, 5, 5, 5, 6, 4, 5, 6, 5, 4, 5, 4, 5, 1}, { 5, 5, 5, 5, 5, 6, 4, 5, 6, 5, 4, 5, 4, 5, 1},
{ 4, 3, 4, 4, 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 2}, { 4, 3, 4, 4, 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 2},
{ 3, 3, 4, 3, 4, 5, 5, 3, 5, 4, 5, 4, 5, 5, 4} { 3, 3, 4, 3, 4, 5, 5, 3, 5, 4, 5, 4, 5, 5, 4}
}; };
/* MV differential tables, p265 */ /* MV differential tables, p265 */
static const uint16_t vc9_mv_diff_codes[4][73] = { static const uint16_t vc1_mv_diff_codes[4][73] = {
{ {
0, 2, 3, 8, 576, 3, 2, 6, 0, 2, 3, 8, 576, 3, 2, 6,
5, 577, 578, 7, 8, 9, 40, 19, 5, 577, 578, 7, 8, 9, 40, 19,
...@@ -367,7 +367,7 @@ static const uint16_t vc9_mv_diff_codes[4][73] = { ...@@ -367,7 +367,7 @@ static const uint16_t vc9_mv_diff_codes[4][73] = {
15 /* 73 elements */ 15 /* 73 elements */
} }
}; };
static const uint8_t vc9_mv_diff_bits[4][73] = { static const uint8_t vc1_mv_diff_bits[4][73] = {
{ {
6, 7, 7, 8, 14, 6, 5, 6, 7, 14, 14, 6, 6, 6, 8, 9, 6, 7, 7, 8, 14, 6, 5, 6, 7, 14, 14, 6, 6, 6, 8, 9,
10, 9, 7, 7, 7, 14, 14, 10, 9, 10, 8, 10, 10, 14, 14, 14, 10, 9, 7, 7, 7, 14, 14, 10, 9, 10, 8, 10, 10, 14, 14, 14,
...@@ -403,4 +403,4 @@ static const uint8_t vc9_mv_diff_bits[4][73] = { ...@@ -403,4 +403,4 @@ static const uint8_t vc9_mv_diff_bits[4][73] = {
/* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */ /* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */
#endif /* VC9DATA_H */ #endif /* VC1DATA_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment