* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
*/
/**
- * @file zmbvenc.c
+ * @file libavcodec/zmbvenc.c
* Zip Motion Blocks Video encoder
*/
#include <stdio.h>
#include <stdlib.h>
-#include "common.h"
+#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include <zlib.h>
z_stream zstream;
} ZmbvEncContext;
+static int score_tab[256];
+
/** Block comparing function
* XXX should be optimized and moved to DSPContext
* TODO handle out of edge ME
{
int sum = 0;
int i, j;
+ uint8_t histogram[256]={0};
for(j = 0; j < bh; j++){
for(i = 0; i < bw; i++)
- sum += src[i] ^ src2[i];
+ histogram[src[i] ^ src2[i]]++;
src += stride;
src2 += stride2;
}
+
+ for(i=1; i<256; i++)
+ sum+= score_tab[histogram[i]];
+
return sum;
}
AVFrame * const p = &c->pic;
uint8_t *src, *prev;
uint32_t *palptr;
- int zret = Z_OK;
int len = 0;
int keyframe, chpal;
int fl;
if(chpal){
uint8_t tpal[3];
for(i = 0; i < 256; i++){
- tpal[0] = palptr[i] >> 16;
- tpal[1] = palptr[i] >> 8;
- tpal[2] = palptr[i];
+ AV_WB24(tpal, palptr[i]);
c->work_buf[work_size++] = tpal[0] ^ c->pal[i * 3 + 0];
c->work_buf[work_size++] = tpal[1] ^ c->pal[i * 3 + 1];
c->work_buf[work_size++] = tpal[2] ^ c->pal[i * 3 + 2];
}
if(keyframe){
for(i = 0; i < 256; i++){
- c->pal[i*3 + 0] = palptr[i] >> 16;
- c->pal[i*3 + 1] = palptr[i] >> 8;
- c->pal[i*3 + 2] = palptr[i];
+ AV_WB24(c->pal+(i*3), palptr[i]);
}
memcpy(c->work_buf, c->pal, 768);
memcpy(c->pal2, p->data[1], 1024);
c->zstream.next_out = c->comp_buf;
c->zstream.avail_out = c->comp_size;
c->zstream.total_out = 0;
- if((zret = deflate(&c->zstream, Z_SYNC_FLUSH)) != Z_OK){
+ if(deflate(&c->zstream, Z_SYNC_FLUSH) != Z_OK){
av_log(avctx, AV_LOG_ERROR, "Error compressing data\n");
return -1;
}
/**
* Init zmbv encoder
*/
-static int encode_init(AVCodecContext *avctx)
+static av_cold int encode_init(AVCodecContext *avctx)
{
ZmbvEncContext * const c = avctx->priv_data;
int zret; // Zlib return code
+ int i;
int lvl = 9;
+ for(i=1; i<256; i++)
+ score_tab[i]= -i * log(i/(double)(ZMBV_BLOCK*ZMBV_BLOCK)) * (256/M_LN2);
+
c->avctx = avctx;
- c->pic.data[0] = NULL;
c->curfrm = 0;
c->keyint = avctx->keyint_min;
c->range = 8;
return -1;
}
- if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
- return -1;
- }
-
// Needed if zlib unused or init aborted before deflateInit
memset(&(c->zstream), 0, sizeof(z_stream));
c->comp_size = avctx->width * avctx->height + 1024 +
av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
return -1;
}
- c->pstride = (avctx->width + 15) & ~15;
+ c->pstride = FFALIGN(avctx->width, 16);
if ((c->prev = av_malloc(c->pstride * avctx->height)) == NULL) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate picture.\n");
return -1;
return -1;
}
+ avctx->coded_frame = (AVFrame*)&c->pic;
+
return 0;
}
/**
* Uninit zmbv encoder
*/
-static int encode_end(AVCodecContext *avctx)
+static av_cold int encode_end(AVCodecContext *avctx)
{
ZmbvEncContext * const c = avctx->priv_data;
encode_init,
encode_frame,
encode_end,
- .pix_fmts = (enum PixelFormat[]){PIX_FMT_PAL8, -1},
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
};