* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/imgutils.h"
+
#include "avcodec.h"
#include "bytestream.h"
#include "internal.h"
-#include "pnm.h"
-
static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet)
{
- PNMContext *s = avctx->priv_data;
- AVFrame * const p = &s->picture;
+ uint8_t *bytestream_start, *bytestream, *bytestream_end;
+ const AVFrame * const p = pict;
int i, h, w, n, linesize, depth, maxval, ret;
const char *tuple_type;
uint8_t *ptr;
+ int size = av_image_get_buffer_size(avctx->pix_fmt,
+ avctx->width, avctx->height, 1);
- if ((ret = ff_alloc_packet(pkt, avpicture_get_size(avctx->pix_fmt,
- avctx->width,
- avctx->height) + 200)) < 0) {
+ if ((ret = ff_alloc_packet(pkt, size + 200)) < 0) {
av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
return ret;
}
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
-
- s->bytestream_start =
- s->bytestream = pkt->data;
- s->bytestream_end = pkt->data + pkt->size;
+ bytestream_start =
+ bytestream = pkt->data;
+ bytestream_end = pkt->data + pkt->size;
h = avctx->height;
w = avctx->width;
default:
return -1;
}
- snprintf(s->bytestream, s->bytestream_end - s->bytestream,
+ snprintf(bytestream, bytestream_end - bytestream,
"P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLTYPE %s\nENDHDR\n",
w, h, depth, maxval, tuple_type);
- s->bytestream += strlen(s->bytestream);
+ bytestream += strlen(bytestream);
ptr = p->data[0];
linesize = p->linesize[0];
for (i = 0; i < h; i++) {
for (j = 0; j < w; j++) {
v = ((uint32_t *)ptr)[j];
- bytestream_put_be24(&s->bytestream, v);
- *s->bytestream++ = v >> 24;
+ bytestream_put_be24(&bytestream, v);
+ *bytestream++ = v >> 24;
}
ptr += linesize;
}
} else {
for (i = 0; i < h; i++) {
- memcpy(s->bytestream, ptr, n);
- s->bytestream += n;
- ptr += linesize;
+ memcpy(bytestream, ptr, n);
+ bytestream += n;
+ ptr += linesize;
}
}
- pkt->size = s->bytestream - s->bytestream_start;
+ pkt->size = bytestream - bytestream_start;
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
+static av_cold int pam_encode_init(AVCodecContext *avctx)
+{
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ avctx->coded_frame->key_frame = 1;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ return 0;
+}
AVCodec ff_pam_encoder = {
.name = "pam",
+ .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PAM,
- .priv_data_size = sizeof(PNMContext),
- .init = ff_pnm_init,
+ .init = pam_encode_init,
.encode2 = pam_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_GRAY8, AV_PIX_FMT_MONOWHITE,
AV_PIX_FMT_NONE
},
- .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
};