avctx->pix_fmt = PIX_FMT_GRAY16BE;
if (s->maxval != 65535)
avctx->pix_fmt = PIX_FMT_GRAY16;
+ } if (avctx->pix_fmt == PIX_FMT_RGB24) {
+ if (s->maxval > 255)
+ avctx->pix_fmt = PIX_FMT_RGB48BE;
} else {
- av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n");
+ av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n");
avctx->pix_fmt = PIX_FMT_NONE;
return -1;
}
switch(avctx->pix_fmt) {
default:
return -1;
+ case PIX_FMT_RGB48BE:
+ n = avctx->width * 6;
+ goto do_read;
case PIX_FMT_RGB24:
n = avctx->width * 3;
goto do_read;
c = '6';
n = avctx->width * 3;
break;
+ case PIX_FMT_RGB48BE:
+ c = '6';
+ n = avctx->width * 6;
+ break;
case PIX_FMT_YUV420P:
c = '5';
n = avctx->width;
s->bytestream += strlen(s->bytestream);
if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
snprintf(s->bytestream, s->bytestream_end - s->bytestream,
- "%d\n", (avctx->pix_fmt != PIX_FMT_GRAY16BE) ? 255 : 65535);
+ "%d\n", (avctx->pix_fmt != PIX_FMT_GRAY16BE && avctx->pix_fmt != PIX_FMT_RGB48BE) ? 255 : 65535);
s->bytestream += strlen(s->bytestream);
}
pnm_encode_frame,
NULL, //encode_end,
pnm_decode_frame,
- .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE},
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
};
#endif // CONFIG_PPM_ENCODER