#include <string.h>
+#include "libavutil/attributes.h"
#include "roqvideo.h"
#include "bytestream.h"
#include "elbg.h"
return sdiff;
}
-typedef struct
-{
+typedef struct SubcelEvaluation {
int eval_dist[4];
int best_bit_use;
int best_coding;
int cbEntry;
} SubcelEvaluation;
-typedef struct
-{
+typedef struct CelEvaluation {
int eval_dist[4];
int best_coding;
int sourceX, sourceY;
} CelEvaluation;
-typedef struct
-{
+typedef struct RoqCodebooks {
int numCB4;
int numCB2;
int usedCB2[MAX_CBS_2x2];
/**
* Initialize cel evaluators and set their source coordinates
*/
-static void create_cel_evals(RoqContext *enc, RoqTempdata *tempData)
+static int create_cel_evals(RoqContext *enc, RoqTempdata *tempData)
{
int n=0, x, y, i;
tempData->cel_evals = av_malloc(enc->width*enc->height/64 * sizeof(CelEvaluation));
+ if (!tempData->cel_evals)
+ return AVERROR(ENOMEM);
/* Map to the ROQ quadtree order */
for (y=0; y<enc->height; y+=16)
tempData->cel_evals[n ].sourceX = x + (i&1)*8;
tempData->cel_evals[n++].sourceY = y + (i&2)*4;
}
+
+ return 0;
}
/**
return ((ax&15)<<4) | (ay&15);
}
-typedef struct
-{
+typedef struct CodingSpool {
int typeSpool;
int typeSpoolLength;
uint8_t argumentSpool[64];
/* Flush the remainder of the argument/type spool */
while (spool.typeSpoolLength)
write_typecode(&spool, 0x0);
-
-#if 0
- uint8_t *fdata[3] = {enc->frame_to_enc->data[0],
- enc->frame_to_enc->data[1],
- enc->frame_to_enc->data[2]};
- uint8_t *cdata[3] = {enc->current_frame->data[0],
- enc->current_frame->data[1],
- enc->current_frame->data[2]};
- av_log(enc->avctx, AV_LOG_ERROR, "Expected distortion: %i Actual: %i\n",
- dist,
- block_sse(fdata, cdata, 0, 0, 0, 0,
- enc->frame_to_enc->linesize,
- enc->current_frame->linesize,
- enc->width)); //WARNING: Square dimensions implied...
-#endif
}
}
}
-static void generate_codebook(RoqContext *enc, RoqTempdata *tempdata,
- int *points, int inputCount, roq_cell *results,
- int size, int cbsize)
+static int generate_codebook(RoqContext *enc, RoqTempdata *tempdata,
+ int *points, int inputCount, roq_cell *results,
+ int size, int cbsize)
{
- int i, j, k;
+ int i, j, k, ret = 0;
int c_size = size*size/4;
int *buf;
int *codebook = av_malloc(6*c_size*cbsize*sizeof(int));
int *closest_cb;
- if (size == 4)
+ if (!codebook)
+ return AVERROR(ENOMEM);
+
+ if (size == 4) {
closest_cb = av_malloc(6*c_size*inputCount*sizeof(int));
- else
+ if (!closest_cb) {
+ ret = AVERROR(ENOMEM);
+ goto out;
+ }
+ } else
closest_cb = tempdata->closest_cb2;
- ff_init_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
- ff_do_elbg(points, 6*c_size, inputCount, codebook, cbsize, 1, closest_cb, &enc->randctx);
-
- if (size == 4)
- av_free(closest_cb);
+ ret = ff_init_elbg(points, 6 * c_size, inputCount, codebook,
+ cbsize, 1, closest_cb, &enc->randctx);
+ if (ret < 0)
+ goto out;
+ ret = ff_do_elbg(points, 6 * c_size, inputCount, codebook,
+ cbsize, 1, closest_cb, &enc->randctx);
+ if (ret < 0)
+ goto out;
buf = codebook;
for (i=0; i<cbsize; i++)
results->v = (*buf++ + CHROMA_BIAS/2)/CHROMA_BIAS;
results++;
}
-
+out:
+ if (size == 4)
+ av_free(closest_cb);
av_free(codebook);
+ return ret;
}
-static void generate_new_codebooks(RoqContext *enc, RoqTempdata *tempData)
+static int generate_new_codebooks(RoqContext *enc, RoqTempdata *tempData)
{
- int i,j;
+ int i, j, ret = 0;
RoqCodebooks *codebooks = &tempData->codebooks;
int max = enc->width*enc->height/16;
uint8_t mb2[3*4];
int *points = av_malloc(max*6*4*sizeof(int));
int bias;
+ if (!results4 || !yuvClusters || !points) {
+ ret = AVERROR(ENOMEM);
+ goto out;
+ }
+
/* Subsample YUV data */
create_clusters(enc->frame_to_enc, enc->width, enc->height, yuvClusters);
}
/* Create 4x4 codebooks */
- generate_codebook(enc, tempData, points, max, results4, 4, MAX_CBS_4x4);
+ if ((ret = generate_codebook(enc, tempData, points, max,
+ results4, 4, MAX_CBS_4x4)) < 0)
+ goto out;
codebooks->numCB4 = MAX_CBS_4x4;
tempData->closest_cb2 = av_malloc(max*4*sizeof(int));
+ if (!tempData->closest_cb2) {
+ ret = AVERROR(ENOMEM);
+ goto out;
+ }
/* Create 2x2 codebooks */
- generate_codebook(enc, tempData, points, max*4, enc->cb2x2, 2, MAX_CBS_2x2);
+ if ((ret = generate_codebook(enc, tempData, points, max * 4,
+ enc->cb2x2, 2, MAX_CBS_2x2)) < 0)
+ goto out;
codebooks->numCB2 = MAX_CBS_2x2;
enlarge_roq_mb4(codebooks->unpacked_cb4 + i*4*4*3,
codebooks->unpacked_cb4_enlarged + i*8*8*3);
}
-
+out:
av_free(yuvClusters);
av_free(points);
av_free(results4);
+ return ret;
}
-static void roq_encode_video(RoqContext *enc)
+static int roq_encode_video(RoqContext *enc)
{
RoqTempdata *tempData = enc->tmpData;
- int i;
+ int i, ret;
memset(tempData, 0, sizeof(*tempData));
- create_cel_evals(enc, tempData);
+ ret = create_cel_evals(enc, tempData);
+ if (ret < 0)
+ return ret;
- generate_new_codebooks(enc, tempData);
+ ret = generate_new_codebooks(enc, tempData);
+ if (ret < 0)
+ return ret;
if (enc->framesSinceKeyframe >= 1) {
motion_search(enc, 8);
reconstruct_and_encode_image(enc, tempData, enc->width, enc->height,
enc->width*enc->height/64);
- enc->avctx->coded_frame = enc->current_frame;
-
/* Rotate frame history */
FFSWAP(AVFrame *, enc->current_frame, enc->last_frame);
FFSWAP(motion_vect *, enc->last_motion4, enc->this_motion4);
av_free(tempData->closest_cb2);
enc->framesSinceKeyframe++;
+
+ return 0;
}
-static int roq_encode_end(AVCodecContext *avctx)
+static av_cold int roq_encode_end(AVCodecContext *avctx)
{
RoqContext *enc = avctx->priv_data;
return 0;
}
-static int roq_encode_init(AVCodecContext *avctx)
+static av_cold int roq_encode_init(AVCodecContext *avctx)
{
RoqContext *enc = avctx->priv_data;
av_lfg_init(&enc->randctx, 1);
+ enc->avctx = avctx;
+
enc->framesSinceKeyframe = 0;
if ((avctx->width & 0xf) || (avctx->height & 0xf)) {
av_log(avctx, AV_LOG_ERROR, "Dimensions must be divisible by 16\n");
}
enc->out_buf = pkt->data;
- /* Check for I frame */
+ /* Check for I-frame */
if (enc->framesSinceKeyframe == avctx->gop_size)
enc->framesSinceKeyframe = 0;
}
/* Encode the actual frame */
- roq_encode_video(enc);
+ ret = roq_encode_video(enc);
+ if (ret < 0)
+ return ret;
pkt->size = enc->out_buf - pkt->data;
if (enc->framesSinceKeyframe == 1)
AVCodec ff_roq_encoder = {
.name = "roqvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_ROQ,
.priv_data_size = sizeof(RoqContext),
.supported_framerates = (const AVRational[]){ {30,1}, {0,0} },
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
};
projects / ffmpeg / blobdiff