RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

Almost-cosmetics: split out coeff_count from all_fragments struct into

Browse Source 
a separate array.
For the OGG version at http://www.bigbuckbunny.org/index.php/download/
this results in about 50% speedup of unpack_vlcs, resulting in ca. 20% faster
overall speed.

Originally committed as revision 13729 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-06-09 16:26:28 +00:00
parent 45b2b05f8e
commit 36e1625396
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/vp3.c
View File

@ -150,7 +150,6 @@ typedef struct Vp3Fragment {
/* this is the macroblock that the fragment belongs to */ /* this is the macroblock that the fragment belongs to */
uint16_t macroblock; uint16_t macroblock;
uint8_t coding_method; uint8_t coding_method;
uint8_t coeff_count;
int8_t motion_x; int8_t motion_x;
int8_t motion_y; int8_t motion_y;
} Vp3Fragment; } Vp3Fragment;
@ -255,6 +254,7 @@ typedef struct Vp3DecodeContext {
int fragment_height; int fragment_height;
Vp3Fragment *all_fragments; Vp3Fragment *all_fragments;
uint8_t *coeff_counts;
Coeff *coeffs; Coeff *coeffs;
Coeff *next_coeff; Coeff *next_coeff;
int fragment_start[3]; int fragment_start[3];
@ -588,7 +588,7 @@ static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
/* zero out all of the fragment information */ /* zero out all of the fragment information */
s->coded_fragment_list_index = 0; s->coded_fragment_list_index = 0;
for (i = 0; i < s->fragment_count; i++) { for (i = 0; i < s->fragment_count; i++) {
s->all_fragments[i].coeff_count = 0; s->coeff_counts[i] = 0;
s->all_fragments[i].motion_x = 127; s->all_fragments[i].motion_x = 127;
s->all_fragments[i].motion_y = 127; s->all_fragments[i].motion_y = 127;
s->all_fragments[i].next_coeff= NULL; s->all_fragments[i].next_coeff= NULL;
@ -1160,10 +1160,11 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
} }
for (i = first_fragment; i <= last_fragment; i++) { for (i = first_fragment; i <= last_fragment; i++) {
int fragment_num = s->coded_fragment_list[i];
fragment = &s->all_fragments[s->coded_fragment_list[i]]; if (s->coeff_counts[fragment_num] > coeff_index)
if (fragment->coeff_count > coeff_index)
continue; continue;
fragment = &s->all_fragments[fragment_num];
if (!eob_run) { if (!eob_run) {
/* decode a VLC into a token */ /* decode a VLC into a token */
@ -1189,10 +1190,10 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
} }
if (!eob_run) { if (!eob_run) {
fragment->coeff_count += zero_run; s->coeff_counts[fragment_num] += zero_run;
if (fragment->coeff_count < 64){ if (s->coeff_counts[fragment_num] < 64){
fragment->next_coeff->coeff= coeff; fragment->next_coeff->coeff= coeff;
fragment->next_coeff->index= perm[fragment->coeff_count++]; //FIXME perm here already? fragment->next_coeff->index= perm[s->coeff_counts[fragment_num]++]; //FIXME perm here already?
fragment->next_coeff->next= s->next_coeff; fragment->next_coeff->next= s->next_coeff;
s->next_coeff->next=NULL; s->next_coeff->next=NULL;
fragment->next_coeff= s->next_coeff++; fragment->next_coeff= s->next_coeff++;
@ -1200,9 +1201,9 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
debug_vlc(" fragment %d coeff = %d\n", debug_vlc(" fragment %d coeff = %d\n",
s->coded_fragment_list[i], fragment->next_coeff[coeff_index]); s->coded_fragment_list[i], fragment->next_coeff[coeff_index]);
} else { } else {
fragment->coeff_count |= 128; s->coeff_counts[fragment_num] |= 128;
debug_vlc(" fragment %d eob with %d coefficients\n", debug_vlc(" fragment %d eob with %d coefficients\n",
s->coded_fragment_list[i], fragment->coeff_count&127); s->coded_fragment_list[i], s->coeff_counts[fragment_num]&127);
eob_run--; eob_run--;
} }
} }
@ -1474,8 +1475,8 @@ static void reverse_dc_prediction(Vp3DecodeContext *s,
s->coeffs[i].coeff += predicted_dc; s->coeffs[i].coeff += predicted_dc;
/* save the DC */ /* save the DC */
last_dc[current_frame_type] = DC_COEFF(i); last_dc[current_frame_type] = DC_COEFF(i);
if(DC_COEFF(i) && !(s->all_fragments[i].coeff_count&127)){ if(DC_COEFF(i) && !(s->coeff_counts[i]&127)){
s->all_fragments[i].coeff_count= 129; s->coeff_counts[i]= 129;
// s->all_fragments[i].next_coeff= s->next_coeff; // s->all_fragments[i].next_coeff= s->next_coeff;
s->coeffs[i].next= s->next_coeff; s->coeffs[i].next= s->next_coeff;
(s->next_coeff++)->next=NULL; (s->next_coeff++)->next=NULL;
@ -2007,6 +2008,7 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
s->fragment_start[2]); s->fragment_start[2]);
s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
s->coeff_counts = av_malloc(s->fragment_count * sizeof(*s->coeff_counts));
s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65); s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int)); s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
s->pixel_addresses_initialized = 0; s->pixel_addresses_initialized = 0;
@ -2317,6 +2319,7 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx)
av_free(s->superblock_coding); av_free(s->superblock_coding);
av_free(s->all_fragments); av_free(s->all_fragments);
av_free(s->coeff_counts);
av_free(s->coeffs); av_free(s->coeffs);
av_free(s->coded_fragment_list); av_free(s->coded_fragment_list);
av_free(s->superblock_fragments); av_free(s->superblock_fragments);