Project: Theora

Revision: 15218

Author: tterribe

Date: 29 Aug 2008 09:34:42

• /trunk/theora/lib/dec/decode.c

  ......	@@ -443,7 +443,7 @@
  443	443	oc_mb *mb;
  444	444	oc_mb *mb_end;
  445	445	const int *alphabet;
  446		long val,j;
  	446	long val;
  447	447	int scheme0_alphabet[8];
  448	448	int mode_scheme;
  449	449	theorapackB_read(&_dec->opb,3,&val);
  ......	@@ -654,7 +654,7 @@
  654	654	else{
  655	655	long val;
  656	656	int flag;
  657		int nqi0;
  	657	int nqi1;
  658	658	int run_count;
  659	659	/*Otherwise, we decode a qi index for each fragment, using two passes of
  660	660	the same binary RLE scheme used for super-block coded bits.
  ......	@@ -666,14 +666,14 @@
  666	666	with the corresponding qi's for this frame.*/
  667	667	theorapackB_read1(&_dec->opb,&val);
  668	668	flag=(int)val;
  669		run_count=nqi0=0;
  	669	run_count=nqi1=0;
  670	670	while(coded_fragi<coded_fragi_end){
  671	671	int full_run;
  672	672	run_count=oc_sb_run_unpack(&_dec->opb);
  673	673	full_run=run_count>=4129;
  674	674	do{
  675	675	_dec->state.frags[*coded_fragi++].qi=flag;
  676		nqi0+=!flag;
  	676	nqi1+=flag;
  677	677	}
  678	678	while(--run_count>0&&coded_fragi<coded_fragi_end);
  679	679	if(full_run&&coded_fragi<coded_fragi_end){
  ......	@@ -686,7 +686,7 @@
  686	686	If it's not, we should issue a warning of some kind.*/
  687	687	/*If we have 3 different qi's for this frame, and there was at least one
  688	688	fragment with a non-zero qi, make the second pass.*/
  689		if(_dec->state.nqis==3&&nqi0<ncoded_fragis){
  	689	if(_dec->state.nqis==3&&nqi1>0){
  690	690	/*Skip qii==0 fragments.*/
  691	691	for(coded_fragi=_dec->state.coded_fragis;
  692	692	_dec->state.frags[*coded_fragi].qi==0;coded_fragi++);