opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

PGM 16-bit gray support

Browse Source 
Originally committed as revision 6780 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov
2006-10-24 05:00:14 +00:00
parent ae912c5b62
commit 22eafdf24f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/pnm.c
View File

@ -70,7 +70,7 @@ static int common_init(AVCodecContext *avctx){
static int pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){ static int pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){
char buf1[32], tuple_type[32]; char buf1[32], tuple_type[32];
int h, w, depth, maxval;; int h, w, depth, maxval;
pnm_get(s, buf1, sizeof(buf1)); pnm_get(s, buf1, sizeof(buf1));
if (!strcmp(buf1, "P4")) { if (!strcmp(buf1, "P4")) {
@ -142,8 +142,9 @@ static int pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){
return -1; return -1;
if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
pnm_get(s, buf1, sizeof(buf1)); pnm_get(s, buf1, sizeof(buf1));
if(atoi(buf1) == 65535 && avctx->pix_fmt == PIX_FMT_GRAY8)
avctx->pix_fmt = PIX_FMT_GRAY16BE;
} }
/* more check if YUV420 */ /* more check if YUV420 */
if (avctx->pix_fmt == PIX_FMT_YUV420P) { if (avctx->pix_fmt == PIX_FMT_YUV420P) {
if ((avctx->width & 1) != 0) if ((avctx->width & 1) != 0)
@ -194,6 +195,9 @@ static int pnm_decode_frame(AVCodecContext *avctx,
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
n = avctx->width; n = avctx->width;
goto do_read; goto do_read;
case PIX_FMT_GRAY16BE:
n = avctx->width * 2;
goto do_read;
case PIX_FMT_MONOWHITE: case PIX_FMT_MONOWHITE:
case PIX_FMT_MONOBLACK: case PIX_FMT_MONOBLACK:
n = (avctx->width + 7) >> 3; n = (avctx->width + 7) >> 3;
@ -292,6 +296,10 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu
c = '5'; c = '5';
n = avctx->width; n = avctx->width;
break; break;
case PIX_FMT_GRAY16BE:
c = '5';
n = avctx->width * 2;
break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
c = '6'; c = '6';
n = avctx->width * 3; n = avctx->width * 3;
@ -310,7 +318,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu
s->bytestream += strlen(s->bytestream); s->bytestream += strlen(s->bytestream);
if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
snprintf(s->bytestream, s->bytestream_end - s->bytestream, snprintf(s->bytestream, s->bytestream_end - s->bytestream,
"%d\n", 255); "%d\n", (avctx->pix_fmt != PIX_FMT_GRAY16BE) ? 255 : 65535);
s->bytestream += strlen(s->bytestream); s->bytestream += strlen(s->bytestream);
} }
@ -537,7 +545,7 @@ AVCodec pgm_encoder = {
pnm_encode_frame, pnm_encode_frame,
NULL, //encode_end, NULL, //encode_end,
pnm_decode_frame, pnm_decode_frame,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, -1}, .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, -1},
}; };
#endif // CONFIG_PGM_ENCODER #endif // CONFIG_PGM_ENCODER