Commit 45beb850 authored by Stefan Gehrer's avatar Stefan Gehrer
Browse files

remove zigzag_scan8x8, it is the same as ff_zigzag_direct

Originally committed as revision 16744 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3e723368
...@@ -3563,14 +3563,14 @@ static void init_scan_tables(H264Context *h){ ...@@ -3563,14 +3563,14 @@ static void init_scan_tables(H264Context *h){
} }
} }
if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){ if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t)); memcpy(h->zigzag_scan8x8, ff_zigzag_direct, 64*sizeof(uint8_t));
memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t)); memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t));
memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t)); memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t));
memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t)); memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t));
}else{ }else{
for(i=0; i<64; i++){ for(i=0; i<64; i++){
#define T(x) (x>>3) | ((x&7)<<3) #define T(x) (x>>3) | ((x&7)<<3)
h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]); h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]);
h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]);
h->field_scan8x8[i] = T(field_scan8x8[i]); h->field_scan8x8[i] = T(field_scan8x8[i]);
h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]);
...@@ -3579,7 +3579,7 @@ static void init_scan_tables(H264Context *h){ ...@@ -3579,7 +3579,7 @@ static void init_scan_tables(H264Context *h){
} }
if(h->sps.transform_bypass){ //FIXME same ugly if(h->sps.transform_bypass){ //FIXME same ugly
h->zigzag_scan_q0 = zigzag_scan; h->zigzag_scan_q0 = zigzag_scan;
h->zigzag_scan8x8_q0 = zigzag_scan8x8; h->zigzag_scan8x8_q0 = ff_zigzag_direct;
h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc; h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc;
h->field_scan_q0 = field_scan; h->field_scan_q0 = field_scan;
h->field_scan8x8_q0 = field_scan8x8; h->field_scan8x8_q0 = field_scan8x8;
...@@ -6981,7 +6981,7 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, ...@@ -6981,7 +6981,7 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
const uint8_t *jvt_list, const uint8_t *fallback_list){ const uint8_t *jvt_list, const uint8_t *fallback_list){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
int i, last = 8, next = 8; int i, last = 8, next = 8;
const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */
memcpy(factors, fallback_list, size*sizeof(uint8_t)); memcpy(factors, fallback_list, size*sizeof(uint8_t));
else else
......
...@@ -286,25 +286,6 @@ static const uint8_t chroma_dc_scan[4]={ ...@@ -286,25 +286,6 @@ static const uint8_t chroma_dc_scan[4]={
(0+1*2)*16, (1+1*2)*16, //FIXME (0+1*2)*16, (1+1*2)*16, //FIXME
}; };
static const uint8_t zigzag_scan8x8[64]={
0+0*8, 1+0*8, 0+1*8, 0+2*8,
1+1*8, 2+0*8, 3+0*8, 2+1*8,
1+2*8, 0+3*8, 0+4*8, 1+3*8,
2+2*8, 3+1*8, 4+0*8, 5+0*8,
4+1*8, 3+2*8, 2+3*8, 1+4*8,
0+5*8, 0+6*8, 1+5*8, 2+4*8,
3+3*8, 4+2*8, 5+1*8, 6+0*8,
7+0*8, 6+1*8, 5+2*8, 4+3*8,
3+4*8, 2+5*8, 1+6*8, 0+7*8,
1+7*8, 2+6*8, 3+5*8, 4+4*8,
5+3*8, 6+2*8, 7+1*8, 7+2*8,
6+3*8, 5+4*8, 4+5*8, 3+6*8,
2+7*8, 3+7*8, 4+6*8, 5+5*8,
6+4*8, 7+3*8, 7+4*8, 6+5*8,
5+6*8, 4+7*8, 5+7*8, 6+6*8,
7+5*8, 7+6*8, 6+7*8, 7+7*8,
};
// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)] // zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)]
static const uint8_t zigzag_scan8x8_cavlc[64]={ static const uint8_t zigzag_scan8x8_cavlc[64]={
0+0*8, 1+1*8, 1+2*8, 2+2*8, 0+0*8, 1+1*8, 1+2*8, 2+2*8,
......
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