Mercurial > libavcodec.hg

comparison lcldec.c @ 9753:ddd880ab64c6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
author reimar
date Sun, 31 May 2009 09:23:54 +0000
parents f52c5d54ede5
children 269e16268683
comparison
equal deleted inserted replaced
9752:f52c5d54ede5 9753:ddd880ab64c6
491 switch (c->imgtype = avctx->extradata[4]) { 491 switch (c->imgtype = avctx->extradata[4]) {
492 case IMGTYPE_YUV111: 492 case IMGTYPE_YUV111:
493 c->decomp_size = basesize * 3; 493 c->decomp_size = basesize * 3;
494 max_decomp_size = max_basesize * 3; 494 max_decomp_size = max_basesize * 3;
495 avctx->pix_fmt = PIX_FMT_YUV444P; 495 avctx->pix_fmt = PIX_FMT_YUV444P;
496 av_log(avctx, AV_LOG_INFO, "Image type is YUV 1:1:1.\n"); 496 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 1:1:1.\n");
497 break; 497 break;
498 case IMGTYPE_YUV422: 498 case IMGTYPE_YUV422:
499 c->decomp_size = basesize * 2; 499 c->decomp_size = basesize * 2;
500 max_decomp_size = max_basesize * 2; 500 max_decomp_size = max_basesize * 2;
501 avctx->pix_fmt = PIX_FMT_YUV422P; 501 avctx->pix_fmt = PIX_FMT_YUV422P;
502 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:2.\n"); 502 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:2.\n");
503 break; 503 break;
504 case IMGTYPE_RGB24: 504 case IMGTYPE_RGB24:
505 c->decomp_size = basesize * 3; 505 c->decomp_size = basesize * 3;
506 max_decomp_size = max_basesize * 3; 506 max_decomp_size = max_basesize * 3;
507 avctx->pix_fmt = PIX_FMT_BGR24; 507 avctx->pix_fmt = PIX_FMT_BGR24;
508 av_log(avctx, AV_LOG_INFO, "Image type is RGB 24.\n"); 508 av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n");
509 break; 509 break;
510 case IMGTYPE_YUV411: 510 case IMGTYPE_YUV411:
511 c->decomp_size = basesize / 2 * 3; 511 c->decomp_size = basesize / 2 * 3;
512 max_decomp_size = max_basesize / 2 * 3; 512 max_decomp_size = max_basesize / 2 * 3;
513 avctx->pix_fmt = PIX_FMT_YUV411P; 513 avctx->pix_fmt = PIX_FMT_YUV411P;
514 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:1:1.\n"); 514 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:1:1.\n");
515 break; 515 break;
516 case IMGTYPE_YUV211: 516 case IMGTYPE_YUV211:
517 c->decomp_size = basesize * 2; 517 c->decomp_size = basesize * 2;
518 max_decomp_size = max_basesize * 2; 518 max_decomp_size = max_basesize * 2;
519 avctx->pix_fmt = PIX_FMT_YUV422P; 519 avctx->pix_fmt = PIX_FMT_YUV422P;
520 av_log(avctx, AV_LOG_INFO, "Image type is YUV 2:1:1.\n"); 520 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 2:1:1.\n");
521 break; 521 break;
522 case IMGTYPE_YUV420: 522 case IMGTYPE_YUV420:
523 c->decomp_size = basesize / 2 * 3; 523 c->decomp_size = basesize / 2 * 3;
524 max_decomp_size = max_basesize / 2 * 3; 524 max_decomp_size = max_basesize / 2 * 3;
525 avctx->pix_fmt = PIX_FMT_YUV420P; 525 avctx->pix_fmt = PIX_FMT_YUV420P;
526 av_log(avctx, AV_LOG_INFO, "Image type is YUV 4:2:0.\n"); 526 av_log(avctx, AV_LOG_DEBUG, "Image type is YUV 4:2:0.\n");
527 break; 527 break;
528 default: 528 default:
529 av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype); 529 av_log(avctx, AV_LOG_ERROR, "Unsupported image format %d.\n", c->imgtype);
530 return 1; 530 return 1;
531 } 531 }
534 c->compression = avctx->extradata[5]; 534 c->compression = avctx->extradata[5];
535 switch (avctx->codec_id) { 535 switch (avctx->codec_id) {
536 case CODEC_ID_MSZH: 536 case CODEC_ID_MSZH:
537 switch (c->compression) { 537 switch (c->compression) {
538 case COMP_MSZH: 538 case COMP_MSZH:
539 av_log(avctx, AV_LOG_INFO, "Compression enabled.\n"); 539 av_log(avctx, AV_LOG_DEBUG, "Compression enabled.\n");
540 break; 540 break;
541 case COMP_MSZH_NOCOMP: 541 case COMP_MSZH_NOCOMP:
542 c->decomp_size = 0; 542 c->decomp_size = 0;
543 av_log(avctx, AV_LOG_INFO, "No compression.\n"); 543 av_log(avctx, AV_LOG_DEBUG, "No compression.\n");
544 break; 544 break;
545 default: 545 default:
546 av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression); 546 av_log(avctx, AV_LOG_ERROR, "Unsupported compression format for MSZH (%d).\n", c->compression);
547 return 1; 547 return 1;
548 } 548 }
549 break; 549 break;
550 #if CONFIG_ZLIB_DECODER 550 #if CONFIG_ZLIB_DECODER
551 case CODEC_ID_ZLIB: 551 case CODEC_ID_ZLIB:
552 switch (c->compression) { 552 switch (c->compression) {
553 case COMP_ZLIB_HISPEED: 553 case COMP_ZLIB_HISPEED:
554 av_log(avctx, AV_LOG_INFO, "High speed compression.\n"); 554 av_log(avctx, AV_LOG_DEBUG, "High speed compression.\n");
555 break; 555 break;
556 case COMP_ZLIB_HICOMP: 556 case COMP_ZLIB_HICOMP:
557 av_log(avctx, AV_LOG_INFO, "High compression.\n"); 557 av_log(avctx, AV_LOG_DEBUG, "High compression.\n");
558 break; 558 break;
559 case COMP_ZLIB_NORMAL: 559 case COMP_ZLIB_NORMAL:
560 av_log(avctx, AV_LOG_INFO, "Normal compression.\n"); 560 av_log(avctx, AV_LOG_DEBUG, "Normal compression.\n");
561 break; 561 break;
562 default: 562 default:
563 if (c->compression < Z_NO_COMPRESSION || c->compression > Z_BEST_COMPRESSION) { 563 if (c->compression < Z_NO_COMPRESSION || c->compression > Z_BEST_COMPRESSION) {
564 av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression); 564 av_log(avctx, AV_LOG_ERROR, "Unsupported compression level for ZLIB: (%d).\n", c->compression);
565 return 1; 565 return 1;
566 } 566 }
567 av_log(avctx, AV_LOG_INFO, "Compression level for ZLIB: (%d).\n", c->compression); 567 av_log(avctx, AV_LOG_DEBUG, "Compression level for ZLIB: (%d).\n", c->compression);
568 } 568 }
569 break; 569 break;
570 #endif 570 #endif
571 default: 571 default:
572 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n"); 572 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in compression switch.\n");
582 } 582 }
583 583
584 /* Detect flags */ 584 /* Detect flags */
585 c->flags = avctx->extradata[6]; 585 c->flags = avctx->extradata[6];
586 if (c->flags & FLAG_MULTITHREAD) 586 if (c->flags & FLAG_MULTITHREAD)
587 av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n"); 587 av_log(avctx, AV_LOG_DEBUG, "Multithread encoder flag set.\n");
588 if (c->flags & FLAG_NULLFRAME) 588 if (c->flags & FLAG_NULLFRAME)
589 av_log(avctx, AV_LOG_INFO, "Nullframe insertion flag set.\n"); 589 av_log(avctx, AV_LOG_DEBUG, "Nullframe insertion flag set.\n");
590 if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER)) 590 if ((avctx->codec_id == CODEC_ID_ZLIB) && (c->flags & FLAG_PNGFILTER))
591 av_log(avctx, AV_LOG_INFO, "PNG filter flag set.\n"); 591 av_log(avctx, AV_LOG_DEBUG, "PNG filter flag set.\n");
592 if (c->flags & FLAGMASK_UNUSED) 592 if (c->flags & FLAGMASK_UNUSED)
593 av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags); 593 av_log(avctx, AV_LOG_ERROR, "Unknown flag set (%d).\n", c->flags);
594 594
595 /* If needed init zlib */ 595 /* If needed init zlib */
596 #if CONFIG_ZLIB_DECODER 596 #if CONFIG_ZLIB_DECODER