*/
/**
- * @file cljr.c
+ * @file libavcodec/cljr.c
* Cirrus Logic AccuPak codec.
*/
#include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "get_bits.h"
+
+/* Disable the encoder. */
+#undef CONFIG_CLJR_ENCODER
+#define CONFIG_CLJR_ENCODER 0
typedef struct CLJRContext{
AVCodecContext *avctx;
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
CLJRContext * const a = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p= (AVFrame*)&a->picture;
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
init_get_bits(&a->gb, buf, buf_size);
return buf_size;
}
-#if 0
+#if CONFIG_CLJR_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
CLJRContext * const a = avctx->priv_data;
AVFrame *pict = data;
AVFrame * const p= (AVFrame*)&a->picture;
int size;
- int mb_x, mb_y;
*p = *pict;
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
emms_c();
}
#endif
-static void common_init(AVCodecContext *avctx){
+static av_cold void common_init(AVCodecContext *avctx){
CLJRContext * const a = avctx->priv_data;
avctx->coded_frame= (AVFrame*)&a->picture;
a->avctx= avctx;
}
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
common_init(avctx);
return 0;
}
-#if 0
-static int encode_init(AVCodecContext *avctx){
+#if CONFIG_CLJR_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx){
common_init(avctx);
NULL,
decode_frame,
CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
};
-#if 0
-#ifdef CONFIG_ENCODERS
+#if CONFIG_CLJR_ENCODER
AVCodec cljr_encoder = {
"cljr",
CODEC_TYPE_VIDEO,
- CODEC_ID_cljr,
+ CODEC_ID_CLJR,
sizeof(CLJRContext),
encode_init,
encode_frame,
//encode_end,
+ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
};
-
-#endif //CONFIG_ENCODERS
#endif