| OLD | NEW |
| 1 /* | 1 /* |
| 2 * TIFF image decoder | 2 * TIFF image decoder |
| 3 * Copyright (c) 2006 Konstantin Shishkov | 3 * Copyright (c) 2006 Konstantin Shishkov |
| 4 * | 4 * |
| 5 * This file is part of FFmpeg. | 5 * This file is part of FFmpeg. |
| 6 * | 6 * |
| 7 * FFmpeg is free software; you can redistribute it and/or | 7 * FFmpeg is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2.1 of the License, or (at your option) any later version. | 10 * version 2.1 of the License, or (at your option) any later version. |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 s->avctx->pix_fmt = PIX_FMT_RGBA; | 299 s->avctx->pix_fmt = PIX_FMT_RGBA; |
| 300 break; | 300 break; |
| 301 case 483: | 301 case 483: |
| 302 s->avctx->pix_fmt = s->le ? PIX_FMT_RGB48LE : PIX_FMT_RGB48BE; | 302 s->avctx->pix_fmt = s->le ? PIX_FMT_RGB48LE : PIX_FMT_RGB48BE; |
| 303 break; | 303 break; |
| 304 default: | 304 default: |
| 305 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d
, %d components)\n", s->bpp, count); | 305 av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d
, %d components)\n", s->bpp, count); |
| 306 return -1; | 306 return -1; |
| 307 } | 307 } |
| 308 if(s->width != s->avctx->width || s->height != s->avctx->height){ | 308 if(s->width != s->avctx->width || s->height != s->avctx->height){ |
| 309 if(av_check_image_size(s->width, s->height, 0, s->avctx)) | 309 if(av_image_check_size(s->width, s->height, 0, s->avctx)) |
| 310 return -1; | 310 return -1; |
| 311 avcodec_set_dimensions(s->avctx, s->width, s->height); | 311 avcodec_set_dimensions(s->avctx, s->width, s->height); |
| 312 } | 312 } |
| 313 if(s->picture.data[0]) | 313 if(s->picture.data[0]) |
| 314 s->avctx->release_buffer(s->avctx, &s->picture); | 314 s->avctx->release_buffer(s->avctx, &s->picture); |
| 315 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ | 315 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ |
| 316 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | 316 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
| 317 return -1; | 317 return -1; |
| 318 } | 318 } |
| 319 if(s->bpp == 8){ | 319 if(s->bpp == 8){ |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 } | 501 } |
| 502 if(!s->stripdata && !s->stripoff){ | 502 if(!s->stripdata && !s->stripoff){ |
| 503 av_log(avctx, AV_LOG_ERROR, "Image data is missing\n"); | 503 av_log(avctx, AV_LOG_ERROR, "Image data is missing\n"); |
| 504 return -1; | 504 return -1; |
| 505 } | 505 } |
| 506 /* now we have the data and may start decoding */ | 506 /* now we have the data and may start decoding */ |
| 507 if(!p->data[0]){ | 507 if(!p->data[0]){ |
| 508 s->bpp = 1; | 508 s->bpp = 1; |
| 509 avctx->pix_fmt = PIX_FMT_MONOBLACK; | 509 avctx->pix_fmt = PIX_FMT_MONOBLACK; |
| 510 if(s->width != s->avctx->width || s->height != s->avctx->height){ | 510 if(s->width != s->avctx->width || s->height != s->avctx->height){ |
| 511 if(av_check_image_size(s->width, s->height, 0, s->avctx)) | 511 if(av_image_check_size(s->width, s->height, 0, s->avctx)) |
| 512 return -1; | 512 return -1; |
| 513 avcodec_set_dimensions(s->avctx, s->width, s->height); | 513 avcodec_set_dimensions(s->avctx, s->width, s->height); |
| 514 } | 514 } |
| 515 if(s->picture.data[0]) | 515 if(s->picture.data[0]) |
| 516 s->avctx->release_buffer(s->avctx, &s->picture); | 516 s->avctx->release_buffer(s->avctx, &s->picture); |
| 517 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ | 517 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ |
| 518 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | 518 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
| 519 return -1; | 519 return -1; |
| 520 } | 520 } |
| 521 } | 521 } |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 CODEC_ID_TIFF, | 597 CODEC_ID_TIFF, |
| 598 sizeof(TiffContext), | 598 sizeof(TiffContext), |
| 599 tiff_init, | 599 tiff_init, |
| 600 NULL, | 600 NULL, |
| 601 tiff_end, | 601 tiff_end, |
| 602 decode_frame, | 602 decode_frame, |
| 603 CODEC_CAP_DR1, | 603 CODEC_CAP_DR1, |
| 604 NULL, | 604 NULL, |
| 605 .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), | 605 .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), |
| 606 }; | 606 }; |
| OLD | NEW |