virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

huffyuv: update to current coding style

Browse Source
This commit is contained in:
Luca Barbato 2012-08-27 12:30:13 +02:00
parent f76e47877c
commit e0f7a9f6e7
1 changed files with 573 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
libavcodec/huffyuv.c
View File

@ -134,7 +134,9 @@ static const unsigned char classic_add_chroma[256] = {
6, 12, 8, 10, 7, 9, 6, 4, 6, 2, 2, 3, 3, 3, 3, 2,
};
static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int left){
static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst,
uint8_t *src, int w, int left)
{
int i;
if (w < 32) {
for (i = 0; i < w; i++) {
@ -154,12 +156,16 @@ static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src
}
}
static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int *red, int *green, int *blue){
static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst,
uint8_t *src, int w,
int *red, int *green, int *blue)
{
int i;
int r,g,b;
r = *red;
g = *green;
b = *blue;
for (i = 0; i < FFMIN(w, 4); i++) {
const int rt = src[i * 4 + R];
const int gt = src[i * 4 + G];
@ -171,13 +177,16 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst, uint8
g = gt;
b = bt;
}
s->dsp.diff_bytes(dst + 16, src + 16, src + 12, w * 4 - 16);
*red = src[(w - 1) * 4 + R];
*green = src[(w - 1) * 4 + G];
*blue = src[(w - 1) * 4 + B];
}
static int read_len_table(uint8_t *dst, GetBitContext *gb){
static int read_len_table(uint8_t *dst, GetBitContext *gb)
{
int i, val, repeat;
for (i = 0; i < 256;) {
@ -185,7 +194,6 @@ static int read_len_table(uint8_t *dst, GetBitContext *gb){
val = get_bits(gb, 5);
if (repeat == 0)
repeat = get_bits(gb, 8);
//printf("%d %d\n", val, repeat);
if (i + repeat > 256 || get_bits_left(gb) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n");
return -1;
@ -196,7 +204,8 @@ static int read_len_table(uint8_t *dst, GetBitContext *gb){
return 0;
}
static int generate_bits_table(uint32_t *dst, const uint8_t *len_table){
static int generate_bits_table(uint32_t *dst, const uint8_t *len_table)
{
int len, index;
uint32_t bits = 0;
@ -234,7 +243,8 @@ static void heap_sift(HeapElem *h, int root, int size)
}
}
static void generate_len_table(uint8_t *dst, const uint64_t *stats){
static void generate_len_table(uint8_t *dst, const uint64_t *stats)
{
HeapElem h[256];
int up[2*256];
int len[2*256];
@ -273,7 +283,8 @@ static void generate_len_table(uint8_t *dst, const uint64_t *stats){
}
#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */
static void generate_joint_tables(HYuvContext *s){
static void generate_joint_tables(HYuvContext *s)
{
uint16_t symbols[1 << VLC_BITS];
uint16_t bits[1 << VLC_BITS];
uint8_t len[1 << VLC_BITS];
@ -297,14 +308,15 @@ static void generate_joint_tables(HYuvContext *s){
}
}
ff_free_vlc(&s->vlc[3 + p]);
ff_init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0);
ff_init_vlc_sparse(&s->vlc[3 + p], VLC_BITS, i, len, 1, 1,
bits, 2, 2, symbols, 2, 2, 0);
}
} else {
uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map;
int i, b, g, r, code;
int p0 = s->decorrelate;
int p1 = !s->decorrelate;
// restrict the range to +/-16 becaues that's pretty much guaranteed to
// restrict the range to +/-16 because that's pretty much guaranteed to
// cover all the combinations that fit in 11 bits total, and it doesn't
// matter if we miss a few rare codes.
for (i = 0, g = -16; g < 16; g++) {
@ -342,7 +354,8 @@ static void generate_joint_tables(HYuvContext *s){
}
}
static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){
static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length)
{
GetBitContext gb;
int i;
@ -355,7 +368,8 @@ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){
return -1;
}
ff_free_vlc(&s->vlc[i]);
init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0);
init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
s->bits[i], 4, 4, 0);
}
generate_joint_tables(s);
@ -363,15 +377,19 @@ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length){
return (get_bits_count(&gb) + 7) / 8;
}
static int read_old_huffman_tables(HYuvContext *s){
static int read_old_huffman_tables(HYuvContext *s)
{
#if 1
GetBitContext gb;
int i;
init_get_bits(&gb, classic_shift_luma, classic_shift_luma_table_size*8);
init_get_bits(&gb, classic_shift_luma,
classic_shift_luma_table_size * 8);
if (read_len_table(s->len[0], &gb) < 0)
return -1;
init_get_bits(&gb, classic_shift_chroma, classic_shift_chroma_table_size*8);
init_get_bits(&gb, classic_shift_chroma,
classic_shift_chroma_table_size * 8);
if (read_len_table(s->len[1], &gb) < 0)
return -1;
@ -387,7 +405,8 @@ static int read_old_huffman_tables(HYuvContext *s){
for (i = 0; i < 3; i++) {
ff_free_vlc(&s->vlc[i]);
init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0);
init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
s->bits[i], 4, 4, 0);
}
generate_joint_tables(s);
@ -399,7 +418,8 @@ static int read_old_huffman_tables(HYuvContext *s){
#endif
}
static av_cold void alloc_temp(HYuvContext *s){
static av_cold void alloc_temp(HYuvContext *s)
{
int i;
if (s->bitstream_bpp<24) {
@ -411,7 +431,8 @@ static av_cold void alloc_temp(HYuvContext *s){
}
}
static av_cold int common_init(AVCodecContext *avctx){
static av_cold int common_init(AVCodecContext *avctx)
{
HYuvContext *s = avctx->priv_data;
s->avctx = avctx;
@ -438,10 +459,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->interlaced = s->height > 288;
s->bgr32 = 1;
//if(avctx->extradata)
// printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size);
if (avctx->extradata_size) {
if((avctx->bits_per_coded_sample&7) && avctx->bits_per_coded_sample != 12)
if ((avctx->bits_per_coded_sample & 7) &&
avctx->bits_per_coded_sample != 12)
s->version = 1; // do such files exist at all?
else
s->version = 2;
@ -464,7 +485,8 @@ s->bgr32=1;
s->interlaced = (interlace == 1) ? 1 : (interlace == 2) ? 0 : s->interlaced;
s->context = ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size-4) < 0)
if ( read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size - 4) < 0)
return -1;
}else{
switch (avctx->bits_per_coded_sample & 7) {
@ -521,8 +543,6 @@ s->bgr32=1;
alloc_temp(s);
// av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced);
return 0;
}
@ -538,7 +558,8 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
s->vlc[i].table = NULL;
if (s->version == 2) {
if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0)
if (read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size) < 0)
return -1;
} else {
if (read_old_huffman_tables(s) < 0)
@ -550,7 +571,8 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */
#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER
static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf){
static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf)
{
int i;
int index = 0;
@ -607,26 +629,34 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (avctx->context_model == 1) {
s->context = avctx->context_model;
if (s->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) {
av_log(avctx, AV_LOG_ERROR, "context=1 is not compatible with 2 pass huffyuv encoding\n");
av_log(avctx, AV_LOG_ERROR,
"context=1 is not compatible with "
"2 pass huffyuv encoding\n");
return -1;
}
}else s->context= 0;
if (avctx->codec->id == AV_CODEC_ID_HUFFYUV) {
if (avctx->pix_fmt == PIX_FMT_YUV420P) {
av_log(avctx, AV_LOG_ERROR, "Error: YV12 is not supported by huffyuv; use vcodec=ffvhuff or format=422p\n");
av_log(avctx, AV_LOG_ERROR,
"Error: YV12 is not supported by huffyuv; use "
"vcodec=ffvhuff or format=422p\n");
return -1;
}
if (avctx->context_model) {
av_log(avctx, AV_LOG_ERROR, "Error: per-frame huffman tables are not supported by huffyuv; use vcodec=ffvhuff\n");
av_log(avctx, AV_LOG_ERROR,
"Error: per-frame huffman tables are not supported "
"by huffyuv; use vcodec=ffvhuff\n");
return -1;
}
if (s->interlaced != ( s->height > 288 ))
av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n");
av_log(avctx, AV_LOG_INFO,
"using huffyuv 2.2.0 or newer interlacing flag\n");
}
if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) {
av_log(avctx, AV_LOG_ERROR, "Error: RGB is incompatible with median predictor\n");
av_log(avctx, AV_LOG_ERROR,
"Error: RGB is incompatible with median predictor\n");
return -1;
}
@ -691,8 +721,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->stats[i][j]= 0;
}
// printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced);
alloc_temp(s);
s->picture_number=0;
@ -714,7 +742,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
}\
}
static void decode_422_bitstream(HYuvContext *s, int count){
static void decode_422_bitstream(HYuvContext *s, int count)
{
int i;
count /= 2;
@ -732,7 +761,8 @@ static void decode_422_bitstream(HYuvContext *s, int count){
}
}
static void decode_gray_bitstream(HYuvContext *s, int count){
static void decode_gray_bitstream(HYuvContext *s, int count)
{
int i;
count/=2;
@ -749,7 +779,8 @@ static void decode_gray_bitstream(HYuvContext *s, int count){
}
#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER
static int encode_422_bitstream(HYuvContext *s, int offset, int count){
static int encode_422_bitstream(HYuvContext *s, int offset, int count)
{
int i;
const uint8_t *y = s->temp[0] + offset;
const uint8_t *u = s->temp[1] + offset / 2;
@ -767,6 +798,7 @@ static int encode_422_bitstream(HYuvContext *s, int offset, int count){
int v0 = v[i];
count /= 2;
if (s->flags & CODEC_FLAG_PASS1) {
for(i = 0; i < count; i++) {
LOAD4;
@ -802,7 +834,8 @@ static int encode_422_bitstream(HYuvContext *s, int offset, int count){
return 0;
}
static int encode_gray_bitstream(HYuvContext *s, int count){
static int encode_gray_bitstream(HYuvContext *s, int count)
{
int i;
if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < 4 * count) {
@ -821,6 +854,7 @@ static int encode_gray_bitstream(HYuvContext *s, int count){
put_bits(&s->pb, s->len[0][y1], s->bits[0][y1]);
count /= 2;
if (s->flags & CODEC_FLAG_PASS1) {
for (i = 0; i < count; i++) {
LOAD2;
@ -846,7 +880,9 @@ static int encode_gray_bitstream(HYuvContext *s, int count){
}
#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */
static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorrelate, int alpha){
static av_always_inline void decode_bgr_1(HYuvContext *s, int count,
int decorrelate, int alpha)
{
int i;
for (i = 0; i < count; i++) {
int code = get_vlc2(&s->gb, s->vlc[3].table, VLC_BITS, 1);
@ -854,8 +890,10 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorre
*(uint32_t*)&s->temp[0][4 * i] = s->pix_bgr_map[code];
} else if(decorrelate) {
s->temp[0][4 * i + G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
s->temp[0][4*i+B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G];
s->temp[0][4*i+R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G];
s->temp[0][4 * i + B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) +
s->temp[0][4 * i + G];
s->temp[0][4 * i + R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) +
s->temp[0][4 * i + G];
} else {
s->temp[0][4 * i + B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);
s->temp[0][4 * i + G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3);
@ -866,7 +904,8 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorre
}
}
static void decode_bgr_bitstream(HYuvContext *s, int count){
static void decode_bgr_bitstream(HYuvContext *s, int count)
{
if (s->decorrelate) {
if (s->bitstream_bpp==24)
decode_bgr_1(s, count, 1, 0);
@ -880,7 +919,8 @@ static void decode_bgr_bitstream(HYuvContext *s, int count){
}
}
static int encode_bgr_bitstream(HYuvContext *s, int count){
static int encode_bgr_bitstream(HYuvContext *s, int count)
{
int i;
if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < 3 * 4 * count) {
@ -901,7 +941,8 @@ static int encode_bgr_bitstream(HYuvContext *s, int count){
put_bits(&s->pb, s->len[0][b], s->bits[0][b]);\
put_bits(&s->pb, s->len[2][r], s->bits[2][r]);
if((s->flags&CODEC_FLAG_PASS1) && (s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT)){
if ((s->flags & CODEC_FLAG_PASS1) &&
(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) {
for (i = 0; i < count; i++) {
LOAD3;
STAT3;
@ -922,7 +963,8 @@ static int encode_bgr_bitstream(HYuvContext *s, int count){
}
#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER
static void draw_slice(HYuvContext *s, int y){
static void draw_slice(HYuvContext *s, int y)
{
int h, cy, i;
int offset[AV_NUM_DATA_POINTERS];
@ -950,7 +992,9 @@ static void draw_slice(HYuvContext *s, int y){
s->last_slice_end = y + h;
}
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
HYuvContext *s = avctx->priv_data;
@ -963,12 +1007,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
AVFrame *picture = data;
av_fast_malloc(&s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
av_fast_malloc(&s->bitstream_buffer,
&s->bitstream_buffer_size,
buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!s->bitstream_buffer)
return AVERROR(ENOMEM);
memset(s->bitstream_buffer + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (const uint32_t*)buf, buf_size/4);
s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer,
(const uint32_t*)buf, buf_size / 4);
if (p->data[0])
ff_thread_release_buffer(avctx, p);
@ -988,7 +1035,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
if ((unsigned)(buf_size-table_size) >= INT_MAX / 8)
return -1;
init_get_bits(&s->gb, s->bitstream_buffer+table_size, (buf_size-table_size)*8);
init_get_bits(&s->gb, s->bitstream_buffer+table_size,
(buf_size-table_size) * 8);
fake_ystride = s->interlaced ? p->linesize[0] * 2 : p->linesize[0];
fake_ustride = s->interlaced ? p->linesize[1] * 2 : p->linesize[1];
@ -1007,7 +1055,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
p->data[0][1] = get_bits(&s->gb, 8);
p->data[0][0] = get_bits(&s->gb, 8);
av_log(avctx, AV_LOG_ERROR, "YUY2 output is not implemented yet\n");
av_log(avctx, AV_LOG_ERROR,
"YUY2 output is not implemented yet\n");
return -1;
} else {
@ -1172,20 +1221,24 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
s->dsp.add_hfyu_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb, &lefta);
if (s->predictor == PLANE) {
if (s->bitstream_bpp != 32) lefta = 0;
if((y&s->interlaced)==0 && y<s->height-1-s->interlaced){
if ((y & s->interlaced) == 0 &&
y < s->height - 1 - s->interlaced) {
s->dsp.add_bytes(p->data[0] + p->linesize[0] * y,
p->data[0] + p->linesize[0]*y + fake_ystride, fake_ystride);
p->data[0] + p->linesize[0] * y +
fake_ystride, fake_ystride);
}
}
}
draw_slice(s, height); // just 1 large slice as this is not possible in reverse order
// just 1 large slice as this is not possible in reverse order
draw_slice(s, height);
break;
default:
av_log(avctx, AV_LOG_ERROR, "prediction type not supported!\n");
av_log(avctx, AV_LOG_ERROR,
"prediction type not supported!\n");
}
}else{
av_log(avctx, AV_LOG_ERROR, "BGR24 output is not implemented yet\n");
av_log(avctx, AV_LOG_ERROR,
"BGR24 output is not implemented yet\n");
return -1;
}
}
@ -1198,7 +1251,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */
static int common_end(HYuvContext *s){
static int common_end(HYuvContext *s)
{
int i;
for(i = 0; i < 3; i++) {
@ -1266,7 +1320,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
init_put_bits(&s->pb, pkt->data + size, pkt->size - size);
if(avctx->pix_fmt == PIX_FMT_YUV422P || avctx->pix_fmt == PIX_FMT_YUV420P){
if (avctx->pix_fmt == PIX_FMT_YUV422P ||
avctx->pix_fmt == PIX_FMT_YUV420P) {
int lefty, leftu, leftv, y, cy;
put_bits(&s->pb, 8, leftv = p->data[2][0]);