Browse Source

Use av_log_ask_for_sample() where appropriate.

tags/n0.8
Diego Biurrun 15 years ago
parent
commit
70fb031ce2
4 changed files with 12 additions and 11 deletions
  1. +6
    -6
      libavcodec/cook.c
  2. +2
    -2
      libavcodec/truemotion1.c
  3. +3
    -2
      libavcodec/tta.c
  4. +1
    -1
      libavcodec/v210x.c

+ 6
- 6
libavcodec/cook.c View File

@@ -1136,7 +1136,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
switch (q->subpacket[s].cookversion) { switch (q->subpacket[s].cookversion) {
case MONO: case MONO:
if (q->nb_channels != 1) { if (q->nb_channels != 1) {
av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n");
av_log_ask_for_sample(avctx, "Container channels != 1.!\n");
return -1; return -1;
} }
av_log(avctx,AV_LOG_DEBUG,"MONO\n"); av_log(avctx,AV_LOG_DEBUG,"MONO\n");
@@ -1150,7 +1150,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break; break;
case JOINT_STEREO: case JOINT_STEREO:
if (q->nb_channels != 2) { if (q->nb_channels != 2) {
av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n");
av_log_ask_for_sample(avctx, "Container channels != 2.\n");
return -1; return -1;
} }
av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n"); av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n");
@@ -1188,7 +1188,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)


break; break;
default: default:
av_log(avctx,AV_LOG_ERROR,"Unknown Cook version, report sample!\n");
av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
return -1; return -1;
break; break;
} }
@@ -1205,7 +1205,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)


/* Try to catch some obviously faulty streams, othervise it might be exploitable */ /* Try to catch some obviously faulty streams, othervise it might be exploitable */
if (q->subpacket[s].total_subbands > 53) { if (q->subpacket[s].total_subbands > 53) {
av_log(avctx,AV_LOG_ERROR,"total_subbands > 53, report sample!\n");
av_log_ask_for_sample(avctx, "total_subbands > 53\n");
return -1; return -1;
} }


@@ -1215,7 +1215,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
} }


if (q->subpacket[s].subbands > 50) { if (q->subpacket[s].subbands > 50) {
av_log(avctx,AV_LOG_ERROR,"subbands > 50, report sample!\n");
av_log_ask_for_sample(avctx, "subbands > 50\n");
return -1; return -1;
} }
q->subpacket[s].gains1.now = q->subpacket[s].gain_1; q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
@@ -1226,7 +1226,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->num_subpackets++; q->num_subpackets++;
s++; s++;
if (s > MAX_SUBPACKETS) { if (s > MAX_SUBPACKETS) {
av_log(avctx,AV_LOG_ERROR,"Too many subpackets > 5, report file!\n");
av_log_ask_for_sample(avctx, "Too many subpackets > 5\n");
return -1; return -1;
} }
} }


+ 2
- 2
libavcodec/truemotion1.c View File

@@ -353,7 +353,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
s->flags = FLAG_KEYFRAME; s->flags = FLAG_KEYFRAME;


if (s->flags & FLAG_SPRITE) { if (s->flags & FLAG_SPRITE) {
av_log(s->avctx, AV_LOG_INFO, "SPRITE frame found, please report the sample to the developers\n");
av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n");
/* FIXME header.width, height, xoffset and yoffset aren't initialized */ /* FIXME header.width, height, xoffset and yoffset aren't initialized */
#if 0 #if 0
s->w = header.width; s->w = header.width;
@@ -370,7 +370,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
if ((s->w < 213) && (s->h >= 176)) if ((s->w < 213) && (s->h >= 176))
{ {
s->flags |= FLAG_INTERPOLATED; s->flags |= FLAG_INTERPOLATED;
av_log(s->avctx, AV_LOG_INFO, "INTERPOLATION selected, please report the sample to the developers\n");
av_log_ask_for_sample(s->avctx, "INTERPOLATION selected.\n");
} }
} }
} }


+ 3
- 2
libavcodec/tta.c View File

@@ -247,7 +247,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
if (s->is_float) if (s->is_float)
{ {
avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
av_log(s->avctx, AV_LOG_ERROR, "Unsupported sample format. Please contact the developers.\n");
av_log_ask_for_sample(s->avctx, "Unsupported sample format.\n");
return -1; return -1;
} }
else switch(s->bps) { else switch(s->bps) {
@@ -256,7 +256,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
// case 3: avctx->sample_fmt = AV_SAMPLE_FMT_S24; break; // case 3: avctx->sample_fmt = AV_SAMPLE_FMT_S24; break;
case 4: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break; case 4: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break;
default: default:
av_log(s->avctx, AV_LOG_ERROR, "Invalid/unsupported sample format. Please contact the developers.\n");
av_log_ask_for_sample(s->avctx,
"Invalid/unsupported sample format.\n");
return -1; return -1;
} }




+ 1
- 1
libavcodec/v210x.c View File

@@ -52,7 +52,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
} }


if(avpkt->size > avctx->width * avctx->height * 8 / 3){ if(avpkt->size > avctx->width * avctx->height * 8 / 3){
av_log(avctx, AV_LOG_ERROR, "Probably padded data, need sample!\n");
av_log_ask_for_sample(avctx, "Probably padded data\n");
} }


pic->reference= 0; pic->reference= 0;


Loading…
Cancel
Save