generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/faxcompr: Support cmode == 9 && xxx == 7

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-08-13 16:11:00 +02:00
parent bd2d4cc4a9
commit 38025e6898
1 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
libavcodec/faxcompr.c
View File

@@ -212,8 +212,78 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
} }
} else if (cmode == 9 || cmode == 10) { } else if (cmode == 9 || cmode == 10) {
int xxx = get_bits(gb, 3); int xxx = get_bits(gb, 3);
avpriv_report_missing_feature(avctx, "Special mode %d xxx=%d support", cmode, xxx); if (cmode == 9 && xxx == 7) {
return AVERROR_PATCHWELCOME; int eob = 0;
int newmode;
if (saved_run) {
av_log(avctx, AV_LOG_ERROR, "saved run %d on entering uncompressed mode\n", saved_run);
return AVERROR_INVALIDDATA;
}
do {
int cwi, k;
int cw = 0;
int codes[2];
do {
cwi = show_bits(gb, 11);
if (!cwi) {
av_log(avctx, AV_LOG_ERROR, "Invalid uncompressed codeword\n");
return AVERROR_INVALIDDATA;
}
cwi = 10 - av_log2(cwi);
skip_bits(gb, cwi + 1);
if (cwi > 5) {
newmode = get_bits1(gb);
eob = 1;
cwi -= 6;
}
cw += cwi;
} while(cwi == 5);
codes[0] = cw;
codes[1] = !eob;
for (k = 0; k < 2; k++) {
if (codes[k]) {
if (mode == k) {
*runs++ = saved_run;
if (runs >= runend) {
av_log(avctx, AV_LOG_ERROR, "uncompressed run overrun\n");
return AVERROR_INVALIDDATA;
}
offs += saved_run;
if (offs > width || run > width) {
av_log(avctx, AV_LOG_ERROR, "uncompressed run went out of bounds\n");
return AVERROR_INVALIDDATA;
}
saved_run = 0;
mode = !mode;
}
saved_run += codes[k];
}
}
} while (!eob);
*runs++ = saved_run;
if (runs >= runend) {
av_log(avctx, AV_LOG_ERROR, "uncompressed run overrun\n");
return AVERROR_INVALIDDATA;
}
offs += saved_run;
if (offs > width || run > width) {
av_log(avctx, AV_LOG_ERROR, "uncompressed run went out of bounds\n");
return AVERROR_INVALIDDATA;
}
saved_run = 0;
mode = !mode;
if (newmode != mode) { //FIXME CHECK
*runs++ = 0;
mode = newmode;
}
} else {
avpriv_report_missing_feature(avctx, "Special mode %d xxx=%d support", cmode, xxx);
return AVERROR_PATCHWELCOME;
}
} else { //vertical mode } else { //vertical mode
run = run_off - offs + (cmode - 5); run = run_off - offs + (cmode - 5);
run_off -= *--ref; run_off -= *--ref;