X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpegvideo.c;h=105fb5502993a7628e22fe52fa15a32e2fb4f6b2;hb=f5957f3fe2b8dfda13a9750acc3e3a03cd5d39c9;hp=112d684373c1ca42283f96f5ca601dbb1330aad8;hpb=8b4c7dbc5507425b0c342948dabf01d714af7068;p=ffmpeg diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 112d684373c..105fb550299 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1,27 +1,23 @@ /* * The simplest mpeg encoder (well, it was the simplest!) - * Copyright (c) 2000,2001 Gerard Lantau. + * Copyright (c) 2000,2001 Fabrice Bellard. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * 4MV & hq & b-frame encoding stuff by Michael Niedermayer */ -#include -#include -#include -#include #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -38,9 +34,9 @@ static void dct_unquantize_mpeg2_c(MpegEncContext *s, static void dct_unquantize_h263_c(MpegEncContext *s, DCTELEM *block, int n, int qscale); static void draw_edges_c(UINT8 *buf, int wrap, int width, int height, int w); -static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale); +static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); -int (*dct_quantize)(MpegEncContext *s, DCTELEM *block, int n, int qscale)= dct_quantize_c; +int (*dct_quantize)(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow)= dct_quantize_c; void (*draw_edges)(UINT8 *buf, int wrap, int width, int height, int w)= draw_edges_c; #define EDGE_WIDTH 16 @@ -78,32 +74,50 @@ extern UINT8 zigzag_end[64]; /* default motion estimation */ int motion_estimation_method = ME_EPZS; -static void convert_matrix(int *qmat, UINT16 *qmat16, const UINT16 *quant_matrix, int qscale) +static void convert_matrix(int (*qmat)[64], uint16_t (*qmat16)[64], uint16_t (*qmat16_bias)[64], + const UINT16 *quant_matrix, int bias) { - int i; - - if (av_fdct == jpeg_fdct_ifast) { - for(i=0;i<64;i++) { - /* 16 <= qscale * quant_matrix[i] <= 7905 */ - /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ - /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ - /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ - - qmat[block_permute_op(i)] = (int)((UINT64_C(1) << (QMAT_SHIFT + 11)) / - (aanscales[i] * qscale * quant_matrix[block_permute_op(i)])); - } - } else { - for(i=0;i<64;i++) { - /* We can safely suppose that 16 <= quant_matrix[i] <= 255 - So 16 <= qscale * quant_matrix[i] <= 7905 - so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 - so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 - */ - qmat[i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); - qmat16[i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[block_permute_op(i)]); + int qscale; + + for(qscale=1; qscale<32; qscale++){ + int i; + if (av_fdct == fdct_ifast) { + for(i=0;i<64;i++) { + const int j= block_permute_op(i); + /* 16 <= qscale * quant_matrix[i] <= 7905 */ + /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ + /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ + /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ + + qmat[qscale][j] = (int)((UINT64_C(1) << (QMAT_SHIFT + 11)) / + (aanscales[i] * qscale * quant_matrix[j])); + } + } else { + for(i=0;i<64;i++) { + /* We can safely suppose that 16 <= quant_matrix[i] <= 255 + So 16 <= qscale * quant_matrix[i] <= 7905 + so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 + so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 + */ + qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); + qmat16[qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[block_permute_op(i)]); + + if(qmat16[qscale][i]==0 || qmat16[qscale][i]==128*256) qmat16[qscale][i]=128*256-1; + + qmat16_bias[qscale][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][i]); + } } } } +// move into common.c perhaps +#define CHECKED_ALLOCZ(p, size)\ +{\ + p= av_mallocz(size);\ + if(p==NULL){\ + perror("malloc");\ + goto fail;\ + }\ +} /* init common structure for both encoder and decoder */ int MPV_common_init(MpegEncContext *s) @@ -138,96 +152,47 @@ int MPV_common_init(MpegEncContext *s) c_size = (w >> shift) * (h >> shift); pict_start = (w >> shift) * (EDGE_WIDTH >> shift) + (EDGE_WIDTH >> shift); - pict = av_mallocz(c_size); - if (pict == NULL) - goto fail; + CHECKED_ALLOCZ(pict, c_size) s->last_picture_base[i] = pict; s->last_picture[i] = pict + pict_start; + if(i>0) memset(s->last_picture_base[i], 128, c_size); - pict = av_mallocz(c_size); - if (pict == NULL) - goto fail; + CHECKED_ALLOCZ(pict, c_size) s->next_picture_base[i] = pict; s->next_picture[i] = pict + pict_start; + if(i>0) memset(s->next_picture_base[i], 128, c_size); - if (s->has_b_frames) { - pict = av_mallocz(c_size); - if (pict == NULL) - goto fail; + if (s->has_b_frames || s->codec_id==CODEC_ID_MPEG4) { + /* Note the MPEG4 stuff is here cuz of buggy encoders which dont set the low_delay flag but + do low-delay encoding, so we cant allways distinguish b-frame containing streams from low_delay streams */ + CHECKED_ALLOCZ(pict, c_size) s->aux_picture_base[i] = pict; s->aux_picture[i] = pict + pict_start; + if(i>0) memset(s->aux_picture_base[i], 128, c_size); } } if (s->encoding) { int j; int mv_table_size= (s->mb_width+2)*(s->mb_height+2); - - /* Allocate MB type table */ - s->mb_type = av_mallocz(s->mb_num * sizeof(char)); - if (s->mb_type == NULL) { - perror("malloc"); - goto fail; - } - s->mb_var = av_mallocz(s->mb_num * sizeof(INT16)); - if (s->mb_var == NULL) { - perror("malloc"); - goto fail; - } + CHECKED_ALLOCZ(s->mb_var , s->mb_num * sizeof(INT16)) + CHECKED_ALLOCZ(s->mc_mb_var, s->mb_num * sizeof(INT16)) /* Allocate MV tables */ - s->p_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->p_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->last_p_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->last_p_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_forw_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_forw_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_back_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_back_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_bidir_forw_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_bidir_forw_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_bidir_back_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_bidir_back_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_direct_forw_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_direct_forw_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_direct_back_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_direct_back_mv_table == NULL) { - perror("malloc"); - goto fail; - } - s->b_direct_mv_table = av_mallocz(mv_table_size * 2 * sizeof(INT16)); - if (s->b_direct_mv_table == NULL) { - perror("malloc"); - goto fail; - } - - s->me_scratchpad = av_mallocz( s->linesize*16*3*sizeof(uint8_t)); - if (s->me_scratchpad == NULL) { - perror("malloc"); - goto fail; - } + CHECKED_ALLOCZ(s->p_mv_table , mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_forw_mv_table , mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_back_mv_table , mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_bidir_forw_mv_table , mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_bidir_back_mv_table , mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_direct_forw_mv_table, mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_direct_back_mv_table, mv_table_size * 2 * sizeof(INT16)) + CHECKED_ALLOCZ(s->b_direct_mv_table , mv_table_size * 2 * sizeof(INT16)) + + CHECKED_ALLOCZ(s->me_scratchpad, s->linesize*16*3*sizeof(uint8_t)) + + CHECKED_ALLOCZ(s->me_map , ME_MAP_SIZE*sizeof(uint32_t)) + CHECKED_ALLOCZ(s->me_score_map, ME_MAP_SIZE*sizeof(uint16_t)) if(s->max_b_frames){ for(j=0; j> shift) * (h >> shift); - pict = av_mallocz(c_size); - if (pict == NULL) - goto fail; + CHECKED_ALLOCZ(pict, c_size); s->picture_buffer[j][i] = pict; } } } + + if(s->codec_id==CODEC_ID_MPEG4){ + CHECKED_ALLOCZ(s->tex_pb_buffer, PB_BUFFER_SIZE); + CHECKED_ALLOCZ( s->pb2_buffer, PB_BUFFER_SIZE); + } } if (s->out_format == FMT_H263 || s->encoding) { int size; + /* Allocate MB type table */ + CHECKED_ALLOCZ(s->mb_type , s->mb_num * sizeof(UINT8)) + /* MV prediction */ size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); - s->motion_val = malloc(size * 2 * sizeof(INT16)); - if (s->motion_val == NULL) - goto fail; - memset(s->motion_val, 0, size * 2 * sizeof(INT16)); + CHECKED_ALLOCZ(s->motion_val, size * 2 * sizeof(INT16)); } if (s->h263_pred || s->h263_plus) { @@ -267,39 +235,38 @@ int MPV_common_init(MpegEncContext *s) y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); c_size = (s->mb_width + 2) * (s->mb_height + 2); size = y_size + 2 * c_size; - s->dc_val[0] = malloc(size * sizeof(INT16)); - if (s->dc_val[0] == NULL) - goto fail; + CHECKED_ALLOCZ(s->dc_val[0], size * sizeof(INT16)); s->dc_val[1] = s->dc_val[0] + y_size; s->dc_val[2] = s->dc_val[1] + c_size; for(i=0;idc_val[0][i] = 1024; /* ac values */ - s->ac_val[0] = av_mallocz(size * sizeof(INT16) * 16); - if (s->ac_val[0] == NULL) - goto fail; + CHECKED_ALLOCZ(s->ac_val[0], size * sizeof(INT16) * 16); s->ac_val[1] = s->ac_val[0] + y_size; s->ac_val[2] = s->ac_val[1] + c_size; /* cbp values */ - s->coded_block = av_mallocz(y_size); - if (!s->coded_block) - goto fail; + CHECKED_ALLOCZ(s->coded_block, y_size); /* which mb is a intra block */ - s->mbintra_table = av_mallocz(s->mb_num); - if (!s->mbintra_table) - goto fail; + CHECKED_ALLOCZ(s->mbintra_table, s->mb_num); memset(s->mbintra_table, 1, s->mb_num); + + /* divx501 bitstream reorder buffer */ + CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE); + + /* cbp, ac_pred, pred_dir */ + CHECKED_ALLOCZ(s->cbp_table , s->mb_num * sizeof(UINT8)) + CHECKED_ALLOCZ(s->pred_dir_table, s->mb_num * sizeof(UINT8)) + + CHECKED_ALLOCZ(s->qscale_table , s->mb_num * sizeof(UINT8)) } /* default structure is frame */ s->picture_structure = PICT_FRAME; /* init macroblock skip table */ - s->mbskip_table = av_mallocz(s->mb_num); - if (!s->mbskip_table) - goto fail; + CHECKED_ALLOCZ(s->mbskip_table, s->mb_num); s->block= s->blocks[0]; @@ -310,43 +277,48 @@ int MPV_common_init(MpegEncContext *s) return -1; } -#define CHECK_FREE(p)\ -{\ - if(p) free(p);\ - p= NULL;\ -} + +//extern int sads; /* init common structure for both encoder and decoder */ void MPV_common_end(MpegEncContext *s) { int i; - CHECK_FREE(s->mb_type); - CHECK_FREE(s->mb_var); - CHECK_FREE(s->p_mv_table); - CHECK_FREE(s->last_p_mv_table); - CHECK_FREE(s->b_forw_mv_table); - CHECK_FREE(s->b_back_mv_table); - CHECK_FREE(s->b_bidir_forw_mv_table); - CHECK_FREE(s->b_bidir_back_mv_table); - CHECK_FREE(s->b_direct_forw_mv_table); - CHECK_FREE(s->b_direct_back_mv_table); - CHECK_FREE(s->b_direct_mv_table); - CHECK_FREE(s->motion_val); - CHECK_FREE(s->dc_val[0]); - CHECK_FREE(s->ac_val[0]); - CHECK_FREE(s->coded_block); - CHECK_FREE(s->mbintra_table); - CHECK_FREE(s->me_scratchpad); - - CHECK_FREE(s->mbskip_table); + av_freep(&s->mb_type); + av_freep(&s->mb_var); + av_freep(&s->mc_mb_var); + av_freep(&s->p_mv_table); + av_freep(&s->b_forw_mv_table); + av_freep(&s->b_back_mv_table); + av_freep(&s->b_bidir_forw_mv_table); + av_freep(&s->b_bidir_back_mv_table); + av_freep(&s->b_direct_forw_mv_table); + av_freep(&s->b_direct_back_mv_table); + av_freep(&s->b_direct_mv_table); + av_freep(&s->motion_val); + av_freep(&s->dc_val[0]); + av_freep(&s->ac_val[0]); + av_freep(&s->coded_block); + av_freep(&s->mbintra_table); + av_freep(&s->cbp_table); + av_freep(&s->pred_dir_table); + av_freep(&s->qscale_table); + av_freep(&s->me_scratchpad); + av_freep(&s->me_map); + av_freep(&s->me_score_map); + + av_freep(&s->mbskip_table); + av_freep(&s->bitstream_buffer); + av_freep(&s->tex_pb_buffer); + av_freep(&s->pb2_buffer); for(i=0;i<3;i++) { int j; - CHECK_FREE(s->last_picture_base[i]); - CHECK_FREE(s->next_picture_base[i]); - CHECK_FREE(s->aux_picture_base[i]); + av_freep(&s->last_picture_base[i]); + av_freep(&s->next_picture_base[i]); + av_freep(&s->aux_picture_base[i]); for(j=0; jpicture_buffer[j][i]); + av_freep(&s->picture_buffer[j][i]); } } s->context_initialized = 0; @@ -365,6 +337,10 @@ int MPV_encode_init(AVCodecContext *avctx) s->frame_rate = avctx->frame_rate; s->width = avctx->width; s->height = avctx->height; + if(avctx->gop_size > 600){ + fprintf(stderr, "Warning keyframe interval too large! reducing it ...\n"); + avctx->gop_size=600; + } s->gop_size = avctx->gop_size; s->rtp_mode = avctx->rtp_mode; s->rtp_payload_size = avctx->rtp_payload_size; @@ -376,13 +352,19 @@ int MPV_encode_init(AVCodecContext *avctx) s->qcompress= avctx->qcompress; s->qblur= avctx->qblur; s->b_quant_factor= avctx->b_quant_factor; + s->b_quant_offset= avctx->b_quant_offset; s->avctx = avctx; s->aspect_ratio_info= avctx->aspect_ratio_info; s->flags= avctx->flags; s->max_b_frames= avctx->max_b_frames; s->rc_strategy= avctx->rc_strategy; s->b_frame_strategy= avctx->b_frame_strategy; - + s->codec_id= avctx->codec->id; + s->luma_elim_threshold = avctx->luma_elim_threshold; + s->chroma_elim_threshold= avctx->chroma_elim_threshold; + s->strict_std_compliance= avctx->strict_std_compliance; + s->data_partitioning= avctx->flags & CODEC_FLAG_PART; + if (s->gop_size <= 1) { s->intra_only = 1; s->gop_size = 12; @@ -403,19 +385,22 @@ int MPV_encode_init(AVCodecContext *avctx) switch(avctx->codec->id) { case CODEC_ID_MPEG1VIDEO: s->out_format = FMT_MPEG1; + avctx->delay=0; //FIXME not sure, should check the spec break; case CODEC_ID_MJPEG: s->out_format = FMT_MJPEG; s->intra_only = 1; /* force intra only for jpeg */ s->mjpeg_write_tables = 1; /* write all tables */ + s->mjpeg_data_only_frames = 0; /* write all the needed headers */ s->mjpeg_vsample[0] = 2; /* set up default sampling factors */ s->mjpeg_vsample[1] = 1; /* the only currently supported values */ s->mjpeg_vsample[2] = 1; - s->mjpeg_hsample[0] = 2; + s->mjpeg_hsample[0] = 2; s->mjpeg_hsample[1] = 1; s->mjpeg_hsample[2] = 1; if (mjpeg_init(s) < 0) return -1; + avctx->delay=0; break; case CODEC_ID_H263: if (h263_get_picture_format(s->width, s->height) == 7) { @@ -423,6 +408,7 @@ int MPV_encode_init(AVCodecContext *avctx) return -1; } s->out_format = FMT_H263; + avctx->delay=0; break; case CODEC_ID_H263P: s->out_format = FMT_H263; @@ -430,20 +416,25 @@ int MPV_encode_init(AVCodecContext *avctx) s->rtp_payload_size = 1200; s->h263_plus = 1; s->unrestricted_mv = 1; + s->h263_aic = 1; /* These are just to be sure */ s->umvplus = 0; s->umvplus_dec = 0; + avctx->delay=0; break; case CODEC_ID_RV10: s->out_format = FMT_H263; s->h263_rv10 = 1; + avctx->delay=0; break; case CODEC_ID_MPEG4: s->out_format = FMT_H263; s->h263_pred = 1; s->unrestricted_mv = 1; s->has_b_frames= s->max_b_frames ? 1 : 0; + s->low_delay=0; + avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); break; case CODEC_ID_MSMPEG4V1: s->out_format = FMT_H263; @@ -451,6 +442,7 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 1; + avctx->delay=0; break; case CODEC_ID_MSMPEG4V2: s->out_format = FMT_H263; @@ -458,6 +450,7 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 2; + avctx->delay=0; break; case CODEC_ID_MSMPEG4V3: s->out_format = FMT_H263; @@ -465,16 +458,28 @@ int MPV_encode_init(AVCodecContext *avctx) s->h263_pred = 1; s->unrestricted_mv = 1; s->msmpeg4_version= 3; + avctx->delay=0; + break; + case CODEC_ID_WMV1: + s->out_format = FMT_H263; + s->h263_msmpeg4 = 1; + s->h263_pred = 1; + s->unrestricted_mv = 1; + s->msmpeg4_version= 4; + avctx->delay=0; + break; + case CODEC_ID_WMV2: + s->out_format = FMT_H263; + s->h263_msmpeg4 = 1; + s->h263_pred = 1; + s->unrestricted_mv = 1; + s->msmpeg4_version= 5; + avctx->delay=0; break; default: return -1; } - if((s->flags&CODEC_FLAG_4MV) && !(s->flags&CODEC_FLAG_HQ)){ - printf("4MV is currently only supported in HQ mode\n"); - return -1; - } - { /* set up some save defaults, some codecs might override them later */ static int done=0; if(!done){ @@ -494,7 +499,9 @@ int MPV_encode_init(AVCodecContext *avctx) if (s->out_format == FMT_H263) h263_encode_init(s); else if (s->out_format == FMT_MPEG1) - mpeg1_encode_init(s); + ff_mpeg1_encode_init(s); + if(s->msmpeg4_version) + ff_msmpeg4_encode_init(s); /* dont use mv_penalty table for crap MV as it would be confused */ if (s->me_method < ME_EPZS) s->mv_penalty = default_mv_penalty; @@ -507,8 +514,21 @@ int MPV_encode_init(AVCodecContext *avctx) /* init default q matrix */ for(i=0;i<64;i++) { - s->intra_matrix[i] = default_intra_matrix[i]; - s->non_intra_matrix[i] = default_non_intra_matrix[i]; + if(s->out_format == FMT_H263) + s->intra_matrix[i] = default_non_intra_matrix[i]; + else + s->intra_matrix[i] = default_intra_matrix[i]; + + s->inter_matrix[i] = default_non_intra_matrix[i]; + } + + /* precompute matrix */ + /* for mjpeg, we do include qscale in the matrix */ + if (s->out_format != FMT_MJPEG) { + convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias, + s->intra_matrix, s->intra_quant_bias); + convert_matrix(s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias, + s->inter_matrix, s->inter_quant_bias); } if(ff_rate_control_init(s) < 0) @@ -576,6 +596,8 @@ void MPV_frame_start(MpegEncContext *s) UINT8 *tmp; s->mb_skiped = 0; + s->decoding_error=0; + if (s->pict_type == B_TYPE) { for(i=0;i<3;i++) { s->current_picture[i] = s->aux_picture[i]; @@ -594,9 +616,11 @@ void MPV_frame_start(MpegEncContext *s) /* generic function for encode/decode called after a frame has been coded/decoded */ void MPV_frame_end(MpegEncContext *s) { +// if((s->picture_number%100)==0 && s->encoding) printf("sads:%d //\n", sads); + /* draw edge for correct motion prediction if outside */ if (s->pict_type != B_TYPE && !s->intra_only) { - if(s->avctx==NULL || s->avctx->codec->id!=CODEC_ID_MPEG4 || s->divx_version==500){ + if(s->avctx==NULL || s->avctx->codec->id!=CODEC_ID_MPEG4 || s->divx_version>=500){ draw_edges(s->current_picture[0], s->linesize, s->mb_width*16, s->mb_height*16, EDGE_WIDTH); draw_edges(s->current_picture[1], s->linesize/2, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2); draw_edges(s->current_picture[2], s->linesize/2, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2); @@ -612,7 +636,9 @@ void MPV_frame_end(MpegEncContext *s) if(s->pict_type!=B_TYPE){ s->last_non_b_pict_type= s->pict_type; s->last_non_b_qscale= s->qscale; - s->last_non_b_mc_mb_var= s->mc_mb_var; + s->last_non_b_mc_mb_var= s->mc_mb_var_sum; + s->num_available_buffers++; + if(s->num_available_buffers>2) s->num_available_buffers= 2; } } @@ -629,6 +655,7 @@ void reorder_input(MpegEncContext *s, AVPicture *pict) s->coded_order[j]= s->coded_order[j+1]; } s->coded_order[j].picture[0]= s->coded_order[j].picture[1]= s->coded_order[j].picture[2]= NULL; //catch uninitalized buffers + s->coded_order[j].pict_type=0; switch(s->input_pict_type){ default: @@ -747,7 +774,9 @@ int MPV_encode_picture(AVCodecContext *avctx, MPV_frame_start(s); encode_picture(s, s->picture_number); - avctx->key_frame = (s->pict_type == I_TYPE); + avctx->key_frame = (s->pict_type == I_TYPE); + avctx->pict_type = s->pict_type; + avctx->real_pict_num = s->picture_number; avctx->header_bits = s->header_bits; avctx->mv_bits = s->mv_bits; avctx->misc_bits = s->misc_bits; @@ -766,6 +795,7 @@ int MPV_encode_picture(AVCodecContext *avctx, if(s->flags&CODEC_FLAG_PASS1) ff_write_pass1_stats(s); + } s->input_picture_number++; @@ -859,7 +889,6 @@ if(s->quarter_sample) motion_x>>=1; motion_y>>=1; } - dxy = ((motion_y & 1) << 1) | (motion_x & 1); src_x = s->mb_x * 16 + (motion_x >> 1); src_y = s->mb_y * (16 >> field_based) + (motion_y >> 1); @@ -878,6 +907,8 @@ if(s->quarter_sample) pix_op[dxy](dest_y, ptr, linesize, h); pix_op[dxy](dest_y + 8, ptr + 8, linesize, h); + if(s->flags&CODEC_FLAG_GRAY) return; + if (s->out_format == FMT_H263) { dxy = 0; if ((motion_x & 3) != 0) @@ -941,6 +972,8 @@ static inline void qpel_motion(MpegEncContext *s, qpix_op[dxy](dest_y + linesize*8 , ptr + linesize*8 , linesize, linesize, motion_x&3, motion_y&3); qpix_op[dxy](dest_y + linesize*8 + 8, ptr + linesize*8 + 8, linesize, linesize, motion_x&3, motion_y&3); + if(s->flags&CODEC_FLAG_GRAY) return; + mx= (motion_x>>1) | (motion_x&1); my= (motion_y>>1) | (motion_y&1); @@ -1029,6 +1062,8 @@ static inline void MPV_motion(MpegEncContext *s, dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; pix_op[dxy](dest, ptr, s->linesize, 8); } + + if(s->flags&CODEC_FLAG_GRAY) break; /* In case of 8X8, we construct a single chroma motion vector with a special rounding */ mx = 0; @@ -1095,8 +1130,7 @@ static inline void put_dct(MpegEncContext *s, { if (!s->mpeg2) s->dct_unquantize(s, block, i, s->qscale); - ff_idct (block); - put_pixels_clamped(block, dest, line_size); + ff_idct_put (dest, line_size, block); } /* add block[] to dest[] */ @@ -1104,13 +1138,51 @@ static inline void add_dct(MpegEncContext *s, DCTELEM *block, int i, UINT8 *dest, int line_size) { if (s->block_last_index[i] >= 0) { - if (!s->mpeg2) - if(s->encoding || (!s->h263_msmpeg4)) - s->dct_unquantize(s, block, i, s->qscale); + ff_idct_add (dest, line_size, block); + } +} + +static inline void add_dequant_dct(MpegEncContext *s, + DCTELEM *block, int i, UINT8 *dest, int line_size) +{ + if (s->block_last_index[i] >= 0) { + s->dct_unquantize(s, block, i, s->qscale); + + ff_idct_add (dest, line_size, block); + } +} - ff_idct (block); - add_pixels_clamped(block, dest, line_size); +/** + * cleans dc, ac, coded_block for the current non intra MB + */ +void ff_clean_intra_table_entries(MpegEncContext *s) +{ + int wrap = s->block_wrap[0]; + int xy = s->block_index[0]; + + s->dc_val[0][xy ] = + s->dc_val[0][xy + 1 ] = + s->dc_val[0][xy + wrap] = + s->dc_val[0][xy + 1 + wrap] = 1024; + /* ac pred */ + memset(s->ac_val[0][xy ], 0, 32 * sizeof(INT16)); + memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(INT16)); + if (s->msmpeg4_version>=3) { + s->coded_block[xy ] = + s->coded_block[xy + 1 ] = + s->coded_block[xy + wrap] = + s->coded_block[xy + 1 + wrap] = 0; } + /* chroma */ + wrap = s->block_wrap[4]; + xy = s->mb_x + 1 + (s->mb_y + 1) * wrap; + s->dc_val[1][xy] = + s->dc_val[2][xy] = 1024; + /* ac pred */ + memset(s->ac_val[1][xy], 0, 16 * sizeof(INT16)); + memset(s->ac_val[2][xy], 0, 16 * sizeof(INT16)); + + s->mbintra_table[s->mb_x + s->mb_y*s->mb_width]= 0; } /* generic function called after a macroblock has been parsed by the @@ -1126,69 +1198,39 @@ static inline void add_dct(MpegEncContext *s, void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) { int mb_x, mb_y; - int dct_linesize, dct_offset; - op_pixels_func *op_pix; - qpel_mc_func *op_qpix; + const int mb_xy = s->mb_y * s->mb_width + s->mb_x; mb_x = s->mb_x; mb_y = s->mb_y; #ifdef FF_POSTPROCESS + /* Obsolete. Exists for compatibility with mplayer only. */ quant_store[mb_y][mb_x]=s->qscale; //printf("[%02d][%02d] %d\n",mb_x,mb_y,s->qscale); +#else + if(s->avctx->quant_store) s->avctx->quant_store[mb_y*s->avctx->qstride+mb_x] = s->qscale; #endif /* update DC predictors for P macroblocks */ if (!s->mb_intra) { if (s->h263_pred || s->h263_aic) { - if(s->mbintra_table[mb_x + mb_y*s->mb_width]) - { - int wrap, xy, v; - s->mbintra_table[mb_x + mb_y*s->mb_width]=0; - wrap = 2 * s->mb_width + 2; - xy = 2 * mb_x + 1 + (2 * mb_y + 1) * wrap; - v = 1024; - - s->dc_val[0][xy] = v; - s->dc_val[0][xy + 1] = v; - s->dc_val[0][xy + wrap] = v; - s->dc_val[0][xy + 1 + wrap] = v; - /* ac pred */ - memset(s->ac_val[0][xy], 0, 16 * sizeof(INT16)); - memset(s->ac_val[0][xy + 1], 0, 16 * sizeof(INT16)); - memset(s->ac_val[0][xy + wrap], 0, 16 * sizeof(INT16)); - memset(s->ac_val[0][xy + 1 + wrap], 0, 16 * sizeof(INT16)); - if (s->h263_msmpeg4) { - s->coded_block[xy] = 0; - s->coded_block[xy + 1] = 0; - s->coded_block[xy + wrap] = 0; - s->coded_block[xy + 1 + wrap] = 0; - } - /* chroma */ - wrap = s->mb_width + 2; - xy = mb_x + 1 + (mb_y + 1) * wrap; - s->dc_val[1][xy] = v; - s->dc_val[2][xy] = v; - /* ac pred */ - memset(s->ac_val[1][xy], 0, 16 * sizeof(INT16)); - memset(s->ac_val[2][xy], 0, 16 * sizeof(INT16)); - } + if(s->mbintra_table[mb_xy]) + ff_clean_intra_table_entries(s); } else { - s->last_dc[0] = 128 << s->intra_dc_precision; - s->last_dc[1] = 128 << s->intra_dc_precision; + s->last_dc[0] = + s->last_dc[1] = s->last_dc[2] = 128 << s->intra_dc_precision; } } else if (s->h263_pred || s->h263_aic) - s->mbintra_table[mb_x + mb_y*s->mb_width]=1; + s->mbintra_table[mb_xy]=1; /* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame */ - if (s->out_format == FMT_H263) { //FIXME move into h263.c if possible, format specific stuff shouldnt be here - if(s->pict_type!=B_TYPE){ - int xy, wrap, motion_x, motion_y; + if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) { //FIXME move into h263.c if possible, format specific stuff shouldnt be here + int motion_x, motion_y; - wrap = 2 * s->mb_width + 2; - xy = 2 * mb_x + 1 + (2 * mb_y + 1) * wrap; + const int wrap = s->block_wrap[0]; + const int xy = s->block_index[0]; if (s->mb_intra) { motion_x = 0; motion_y = 0; @@ -1207,17 +1249,18 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) s->motion_val[xy + 1 + wrap][0] = motion_x; s->motion_val[xy + 1 + wrap][1] = motion_y; } - } } if (!(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { UINT8 *dest_y, *dest_cb, *dest_cr; - UINT8 *mbskip_ptr; + int dct_linesize, dct_offset; + op_pixels_func *op_pix; + qpel_mc_func *op_qpix; /* avoid copy if macroblock skipped in last frame too dont touch it for B-frames as they need the skip info from the next p-frame */ if (s->pict_type != B_TYPE) { - mbskip_ptr = &s->mbskip_table[s->mb_y * s->mb_width + s->mb_x]; + UINT8 *mbskip_ptr = &s->mbskip_table[mb_xy]; if (s->mb_skiped) { s->mb_skiped = 0; /* if previous was skipped too, then nothing to do ! @@ -1244,7 +1287,8 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) if (!s->mb_intra) { /* motion handling */ - if((s->flags&CODEC_FLAG_HQ) || (!s->encoding)){ + /* decoding or more than one mb_type (MC was allready done otherwise) */ + if((!s->encoding) || (s->mb_type[mb_xy]&(s->mb_type[mb_xy]-1))){ if ((!s->no_rounding) || s->pict_type==B_TYPE){ op_pix = put_pixels_tab; op_qpix= qpel_mc_rnd_tab; @@ -1265,14 +1309,31 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) } } - /* add dct residue */ - add_dct(s, block[0], 0, dest_y, dct_linesize); - add_dct(s, block[1], 1, dest_y + 8, dct_linesize); - add_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); - add_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); + /* skip dequant / idct if we are really late ;) */ + if(s->hurry_up>1) goto the_end; - add_dct(s, block[4], 4, dest_cb, s->linesize >> 1); - add_dct(s, block[5], 5, dest_cr, s->linesize >> 1); + /* add dct residue */ + if(!s->mpeg2 && (s->encoding || (!s->h263_msmpeg4))){ + add_dequant_dct(s, block[0], 0, dest_y, dct_linesize); + add_dequant_dct(s, block[1], 1, dest_y + 8, dct_linesize); + add_dequant_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); + add_dequant_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); + + if(!(s->flags&CODEC_FLAG_GRAY)){ + add_dequant_dct(s, block[4], 4, dest_cb, s->linesize >> 1); + add_dequant_dct(s, block[5], 5, dest_cr, s->linesize >> 1); + } + } else { + add_dct(s, block[0], 0, dest_y, dct_linesize); + add_dct(s, block[1], 1, dest_y + 8, dct_linesize); + add_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); + add_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); + + if(!(s->flags&CODEC_FLAG_GRAY)){ + add_dct(s, block[4], 4, dest_cb, s->linesize >> 1); + add_dct(s, block[5], 5, dest_cr, s->linesize >> 1); + } + } } else { /* dct only in intra block */ put_dct(s, block[0], 0, dest_y, dct_linesize); @@ -1280,20 +1341,82 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) put_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); put_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); - put_dct(s, block[4], 4, dest_cb, s->linesize >> 1); - put_dct(s, block[5], 5, dest_cr, s->linesize >> 1); + if(!(s->flags&CODEC_FLAG_GRAY)){ + put_dct(s, block[4], 4, dest_cb, s->linesize >> 1); + put_dct(s, block[5], 5, dest_cr, s->linesize >> 1); + } } } the_end: emms_c(); //FIXME remove } +static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold, int skip_dc) +{ + static const char tab[64]= + {3,2,2,1,1,1,1,1, + 1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0}; + int score=0; + int run=0; + int i; + DCTELEM *block= s->block[n]; + const int last_index= s->block_last_index[n]; + + if(skip_dc) skip_dc=1; + + /* are all which we could set to zero are allready zero? */ + if(last_index<=skip_dc - 1) return; + + for(i=0; i<=last_index; i++){ + const int j = zigzag_direct[i]; + const int level = ABS(block[j]); + if(level==1){ + if(skip_dc && i==0) continue; + score+= tab[run]; + run=0; + }else if(level>1){ + return; + }else{ + run++; + } + } + if(score >= threshold) return; + for(i=skip_dc; i<=last_index; i++){ + const int j = zigzag_direct[i]; + block[j]=0; + } + if(block[0]) s->block_last_index[n]= 0; + else s->block_last_index[n]= -1; +} + +static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) +{ + int i; + const int maxlevel= s->max_qcoeff; + const int minlevel= s->min_qcoeff; + + for(i=0;i<=last_index; i++){ + const int j = zigzag_direct[i]; + int level = block[j]; + + if (level>maxlevel) level=maxlevel; + else if(levelmb_x; const int mb_y= s->mb_y; int i; + int skip_dct[6]; #if 0 if (s->interlaced_dct) { dct_linesize = s->linesize * 2; @@ -1303,6 +1426,7 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) dct_offset = s->linesize * 8; } #endif + for(i=0; i<6; i++) skip_dct[i]=0; if (s->mb_intra) { UINT8 *ptr; @@ -1315,22 +1439,32 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) get_pixels(s->block[2], ptr + 8 * wrap , wrap); get_pixels(s->block[3], ptr + 8 * wrap + 8, wrap); - wrap >>=1; - ptr = s->new_picture[1] + (mb_y * 8 * wrap) + mb_x * 8; - get_pixels(s->block[4], ptr, wrap); + if(s->flags&CODEC_FLAG_GRAY){ + skip_dct[4]= 1; + skip_dct[5]= 1; + }else{ + wrap >>=1; + ptr = s->new_picture[1] + (mb_y * 8 * wrap) + mb_x * 8; + get_pixels(s->block[4], ptr, wrap); - ptr = s->new_picture[2] + (mb_y * 8 * wrap) + mb_x * 8; - get_pixels(s->block[5], ptr, wrap); + ptr = s->new_picture[2] + (mb_y * 8 * wrap) + mb_x * 8; + get_pixels(s->block[5], ptr, wrap); + } }else{ op_pixels_func *op_pix; qpel_mc_func *op_qpix; UINT8 *dest_y, *dest_cb, *dest_cr; - UINT8 *ptr; - int wrap; + UINT8 *ptr_y, *ptr_cb, *ptr_cr; + int wrap_y, wrap_c; dest_y = s->current_picture[0] + (mb_y * 16 * s->linesize ) + mb_x * 16; dest_cb = s->current_picture[1] + (mb_y * 8 * (s->linesize >> 1)) + mb_x * 8; dest_cr = s->current_picture[2] + (mb_y * 8 * (s->linesize >> 1)) + mb_x * 8; + wrap_y = s->linesize; + wrap_c = wrap_y>>1; + ptr_y = s->new_picture[0] + (mb_y * 16 * wrap_y) + mb_x * 16; + ptr_cb = s->new_picture[1] + (mb_y * 8 * wrap_c) + mb_x * 8; + ptr_cr = s->new_picture[2] + (mb_y * 8 * wrap_c) + mb_x * 8; if ((!s->no_rounding) || s->pict_type==B_TYPE){ op_pix = put_pixels_tab; @@ -1350,19 +1484,45 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) if (s->mv_dir & MV_DIR_BACKWARD) { MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture, op_pix, op_qpix); } - wrap = s->linesize; - ptr = s->new_picture[0] + (mb_y * 16 * wrap) + mb_x * 16; - diff_pixels(s->block[0], ptr , dest_y , wrap); - diff_pixels(s->block[1], ptr + 8, dest_y + 8, wrap); - diff_pixels(s->block[2], ptr + 8 * wrap , dest_y + 8 * wrap , wrap); - diff_pixels(s->block[3], ptr + 8 * wrap + 8, dest_y + 8 * wrap + 8, wrap); - wrap >>=1; - ptr = s->new_picture[1] + (mb_y * 8 * wrap) + mb_x * 8; - diff_pixels(s->block[4], ptr, dest_cb, wrap); + diff_pixels(s->block[0], ptr_y , dest_y , wrap_y); + diff_pixels(s->block[1], ptr_y + 8, dest_y + 8, wrap_y); + diff_pixels(s->block[2], ptr_y + 8 * wrap_y , dest_y + 8 * wrap_y , wrap_y); + diff_pixels(s->block[3], ptr_y + 8 * wrap_y + 8, dest_y + 8 * wrap_y + 8, wrap_y); + + if(s->flags&CODEC_FLAG_GRAY){ + skip_dct[4]= 1; + skip_dct[5]= 1; + }else{ + diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c); + diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); + } + + /* pre quantization */ + if(s->mc_mb_var[s->mb_width*mb_y+ mb_x]<2*s->qscale*s->qscale){ + if(pix_abs8x8(ptr_y , dest_y , wrap_y) < 20*s->qscale) skip_dct[0]= 1; + if(pix_abs8x8(ptr_y + 8, dest_y + 8, wrap_y) < 20*s->qscale) skip_dct[1]= 1; + if(pix_abs8x8(ptr_y + 8*wrap_y , dest_y + 8*wrap_y , wrap_y) < 20*s->qscale) skip_dct[2]= 1; + if(pix_abs8x8(ptr_y + 8*wrap_y + 8, dest_y + 8*wrap_y + 8, wrap_y) < 20*s->qscale) skip_dct[3]= 1; + if(pix_abs8x8(ptr_cb , dest_cb , wrap_y) < 20*s->qscale) skip_dct[4]= 1; + if(pix_abs8x8(ptr_cr , dest_cr , wrap_y) < 20*s->qscale) skip_dct[5]= 1; +#if 0 +{ + static int stat[7]; + int num=0; + for(i=0; i<6; i++) + if(skip_dct[i]) num++; + stat[num]++; + + if(s->mb_x==0 && s->mb_y==0){ + for(i=0; i<7; i++){ + printf("%6d %1d\n", stat[i], i); + } + } +} +#endif + } - ptr = s->new_picture[2] + (mb_y * 8 * wrap) + mb_x * 8; - diff_pixels(s->block[5], ptr, dest_cr, wrap); } #if 0 @@ -1379,17 +1539,37 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) } #endif /* DCT & quantize */ - if (s->h263_msmpeg4) { - msmpeg4_dc_scale(s); - } else if (s->h263_pred) { - h263_dc_scale(s); - } else { - /* default quantization values */ - s->y_dc_scale = 8; - s->c_dc_scale = 8; + if(s->out_format==FMT_MJPEG){ + for(i=0;i<6;i++) { + int overflow; + s->block_last_index[i] = dct_quantize(s, s->block[i], i, 8, &overflow); + if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); + } + }else{ + for(i=0;i<6;i++) { + if(!skip_dct[i]){ + int overflow; + s->block_last_index[i] = dct_quantize(s, s->block[i], i, s->qscale, &overflow); + // FIXME we could decide to change to quantizer instead of clipping + // JS: I don't think that would be a good idea it could lower quality instead + // of improve it. Just INTRADC clipping deserves changes in quantizer + if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); + }else + s->block_last_index[i]= -1; + } + if(s->luma_elim_threshold && !s->mb_intra) + for(i=0; i<4; i++) + dct_single_coeff_elimination(s, i, s->luma_elim_threshold, 0); + if(s->chroma_elim_threshold && !s->mb_intra) + for(i=4; i<6; i++) + dct_single_coeff_elimination(s, i, s->chroma_elim_threshold, 1); } - for(i=0;i<6;i++) { - s->block_last_index[i] = dct_quantize(s, s->block[i], i, s->qscale); + + if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ + s->block_last_index[4]= + s->block_last_index[5]= 0; + s->block[4][0]= + s->block[5][0]= 128; } /* huffman encode */ @@ -1411,26 +1591,19 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) } } -static void copy_bits(PutBitContext *pb, UINT8 *src, int length) +void ff_copy_bits(PutBitContext *pb, UINT8 *src, int length) { -#if 1 int bytes= length>>4; int bits= length&15; int i; + if(length==0) return; + for(i=0; i>(16-bits)); -#else - int bytes= length>>3; - int bits= length&7; - int i; - - for(i=0; i>(8-bits)); -#endif } -static void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ +static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ int i; memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? @@ -1453,7 +1626,7 @@ static void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int d->mb_skiped= s->mb_skiped; } -static void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ +static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ int i; memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); @@ -1478,11 +1651,45 @@ static void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int d->mv_type= s->mv_type; d->mv_dir= s->mv_dir; d->pb= s->pb; + if(s->data_partitioning){ + d->pb2= s->pb2; + d->tex_pb= s->tex_pb; + } d->block= s->block; for(i=0; i<6; i++) d->block_last_index[i]= s->block_last_index[i]; } +static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, + PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], + int *dmin, int *next_block, int motion_x, int motion_y) +{ + int bits_count; + + copy_context_before_encode(s, backup, type); + + s->block= s->blocks[*next_block]; + s->pb= pb[*next_block]; + if(s->data_partitioning){ + s->pb2 = pb2 [*next_block]; + s->tex_pb= tex_pb[*next_block]; + } + + encode_mb(s, motion_x, motion_y); + + bits_count= get_bit_count(&s->pb); + if(s->data_partitioning){ + bits_count+= get_bit_count(&s->pb2); + bits_count+= get_bit_count(&s->tex_pb); + } + + if(bits_count<*dmin){ + *dmin= bits_count; + *next_block^=1; + + copy_context_after_encode(best, s, type); + } +} static void encode_picture(MpegEncContext *s, int picture_number) { @@ -1490,7 +1697,16 @@ static void encode_picture(MpegEncContext *s, int picture_number) int i; int bits; MpegEncContext best_s, backup_s; - UINT8 bit_buf[7][3000]; //FIXME check that this is ALLWAYS large enogh for a MB + UINT8 bit_buf[2][3000]; + UINT8 bit_buf2[2][3000]; + UINT8 bit_buf_tex[2][3000]; + PutBitContext pb[2], pb2[2], tex_pb[2]; + + for(i=0; i<2; i++){ + init_put_bits(&pb [i], bit_buf [i], 3000, NULL, NULL); + init_put_bits(&pb2 [i], bit_buf2 [i], 3000, NULL, NULL); + init_put_bits(&tex_pb[i], bit_buf_tex[i], 3000, NULL, NULL); + } s->picture_number = picture_number; @@ -1502,8 +1718,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->block_wrap[5]= s->mb_width + 2; /* Reset the average MB variance */ - s->avg_mb_var = 0; - s->mc_mb_var = 0; + s->mb_var_sum = 0; + s->mc_mb_var_sum = 0; /* we need to initialize some time vars before we can encode b-frames */ if (s->h263_pred && !s->h263_msmpeg4) @@ -1511,10 +1727,6 @@ static void encode_picture(MpegEncContext *s, int picture_number) /* Estimate motion for every MB */ if(s->pict_type != I_TYPE){ -// int16_t (*tmp)[2]= s->p_mv_table; -// s->p_mv_table= s->last_mv_table; -// s->last_mv_table= s->mv_table; - for(mb_y=0; mb_y < s->mb_height; mb_y++) { s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1; s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1); @@ -1537,7 +1749,7 @@ static void encode_picture(MpegEncContext *s, int picture_number) } } emms_c(); - }else if(s->pict_type == I_TYPE){ + }else /* if(s->pict_type == I_TYPE) */{ /* I-Frame */ //FIXME do we need to zero them? memset(s->motion_val[0], 0, sizeof(INT16)*(s->mb_width*2 + 2)*(s->mb_height*2 + 2)*2); @@ -1545,7 +1757,7 @@ static void encode_picture(MpegEncContext *s, int picture_number) memset(s->mb_type , MB_TYPE_INTRA, sizeof(UINT8)*s->mb_width*s->mb_height); } - if(s->avg_mb_var < s->mc_mb_var && s->pict_type == P_TYPE){ //FIXME subtract MV bits + if(s->mb_var_sum < s->mc_mb_var_sum && s->pict_type == P_TYPE){ //FIXME subtract MV bits s->pict_type= I_TYPE; memset(s->mb_type , MB_TYPE_INTRA, sizeof(UINT8)*s->mb_width*s->mb_height); if(s->max_b_frames==0){ @@ -1577,17 +1789,13 @@ static void encode_picture(MpegEncContext *s, int picture_number) else if (!s->fixed_qscale) s->qscale = ff_rate_estimate_qscale(s); - - /* precompute matrix */ if (s->out_format == FMT_MJPEG) { /* for mjpeg, we do include qscale in the matrix */ s->intra_matrix[0] = default_intra_matrix[0]; for(i=1;i<64;i++) - s->intra_matrix[i] = (default_intra_matrix[i] * s->qscale) >> 3; - convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, s->intra_matrix, 8); - } else { - convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, s->intra_matrix, s->qscale); - convert_matrix(s->q_non_intra_matrix, s->q_non_intra_matrix16, s->non_intra_matrix, s->qscale); + s->intra_matrix[i] = CLAMP_TO_8BIT((default_intra_matrix[i] * s->qscale) >> 3); + convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, + s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias); } s->last_bits= get_bit_count(&s->pb); @@ -1637,24 +1845,37 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->gob_index = 2; else s->gob_index = 4; + }else if(s->codec_id==CODEC_ID_MPEG4){ + s->gob_index = 1; } - - s->avg_mb_var = s->avg_mb_var / s->mb_num; - + + if(s->codec_id==CODEC_ID_MPEG4 && s->data_partitioning && s->pict_type!=B_TYPE) + ff_mpeg4_init_partitions(s); + + s->resync_mb_x=0; + s->resync_mb_y=0; for(mb_y=0; mb_y < s->mb_height; mb_y++) { - /* Put GOB header based on RTP MTU */ + /* Put GOB header based on RTP MTU for formats which support it per line (H263*)*/ /* TODO: Put all this stuff in a separate generic function */ if (s->rtp_mode) { if (!mb_y) { s->ptr_lastgob = s->pb.buf; s->ptr_last_mb_line = s->pb.buf; } else if (s->out_format == FMT_H263 && !s->h263_pred && !s->h263_msmpeg4 && !(mb_y % s->gob_index)) { + // MN: we could move the space check from h263 -> here, as its not h263 specific last_gob = h263_encode_gob_header(s, mb_y); if (last_gob) { - s->first_gob_line = 1; + s->first_slice_line = 1; + }else{ + /*MN: we reset it here instead at the end of each line cuz mpeg4 can have + slice lines starting & ending in the middle*/ + s->first_slice_line = 0; } } } + + s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; + s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1; s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1); @@ -1665,10 +1886,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) for(mb_x=0; mb_x < s->mb_width; mb_x++) { const int mb_type= s->mb_type[mb_y * s->mb_width + mb_x]; const int xy= (mb_y+1) * (s->mb_width+2) + mb_x + 1; - PutBitContext pb; - int d; +// int d; int dmin=10000000; - int best=0; s->mb_x = mb_x; s->mb_y = mb_y; @@ -1678,11 +1897,50 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->block_index[3]+=2; s->block_index[4]++; s->block_index[5]++; + + /* write gob / video packet header for formats which support it at any MB (MPEG4) */ + if(s->rtp_mode && s->mb_y>0 && s->codec_id==CODEC_ID_MPEG4){ + int pdif= pbBufPtr(&s->pb) - s->ptr_lastgob; + + //the *2 is there so we stay below the requested size + if(pdif + s->mb_line_avgsize/s->mb_width >= s->rtp_payload_size){ + if(s->codec_id==CODEC_ID_MPEG4){ + if(s->data_partitioning && s->pict_type!=B_TYPE){ + ff_mpeg4_merge_partitions(s); + ff_mpeg4_init_partitions(s); + } + ff_mpeg4_encode_video_packet_header(s); + + if(s->flags&CODEC_FLAG_PASS1){ + int bits= get_bit_count(&s->pb); + s->misc_bits+= bits - s->last_bits; + s->last_bits= bits; + } + ff_mpeg4_clean_buffers(s); + } + s->ptr_lastgob = pbBufPtr(&s->pb); + s->first_slice_line=1; + s->resync_mb_x=mb_x; + s->resync_mb_y=mb_y; + } + + if( (s->resync_mb_x == s->mb_x) + && s->resync_mb_y+1 == s->mb_y){ + s->first_slice_line=0; + } + } + if(mb_type & (mb_type-1)){ // more than 1 MB type possible int next_block=0; - pb= s->pb; + int pb_bits_count, pb2_bits_count, tex_pb_bits_count; copy_context_before_encode(&backup_s, s, -1); + backup_s.pb= s->pb; + best_s.data_partitioning= s->data_partitioning; + if(s->data_partitioning){ + backup_s.pb2= s->pb2; + backup_s.tex_pb= s->tex_pb; + } if(mb_type&MB_TYPE_INTER){ s->mv_dir = MV_DIR_FORWARD; @@ -1690,22 +1948,10 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->mb_intra= 0; s->mv[0][0][0] = s->p_mv_table[xy][0]; s->mv[0][0][1] = s->p_mv_table[xy][1]; - init_put_bits(&s->pb, bit_buf[1], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - s->last_bits= 0; //done in copy_context_before_encode but we skip that here - - encode_mb(s, s->mv[0][0][0], s->mv[0][0][1]); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_INTER); - best=1; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER, pb, pb2, tex_pb, + &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); } if(mb_type&MB_TYPE_INTER4V){ - copy_context_before_encode(s, &backup_s, MB_TYPE_INTER4V); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_8X8; s->mb_intra= 0; @@ -1713,61 +1959,28 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->mv[0][i][0] = s->motion_val[s->block_index[i]][0]; s->mv[0][i][1] = s->motion_val[s->block_index[i]][1]; } - init_put_bits(&s->pb, bit_buf[2], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, 0, 0); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_INTER4V); - best=2; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER4V, pb, pb2, tex_pb, + &dmin, &next_block, 0, 0); } if(mb_type&MB_TYPE_FORWARD){ - copy_context_before_encode(s, &backup_s, MB_TYPE_FORWARD); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; s->mb_intra= 0; s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; - init_put_bits(&s->pb, bit_buf[3], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, s->mv[0][0][0], s->mv[0][0][1]); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_FORWARD); - best=3; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_FORWARD, pb, pb2, tex_pb, + &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); } if(mb_type&MB_TYPE_BACKWARD){ - copy_context_before_encode(s, &backup_s, MB_TYPE_BACKWARD); s->mv_dir = MV_DIR_BACKWARD; s->mv_type = MV_TYPE_16X16; s->mb_intra= 0; s->mv[1][0][0] = s->b_back_mv_table[xy][0]; s->mv[1][0][1] = s->b_back_mv_table[xy][1]; - init_put_bits(&s->pb, bit_buf[4], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, s->mv[1][0][0], s->mv[1][0][1]); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_BACKWARD); - best=4; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BACKWARD, pb, pb2, tex_pb, + &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); } if(mb_type&MB_TYPE_BIDIR){ - copy_context_before_encode(s, &backup_s, MB_TYPE_BIDIR); s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; s->mv_type = MV_TYPE_16X16; s->mb_intra= 0; @@ -1775,21 +1988,10 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; - init_put_bits(&s->pb, bit_buf[5], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, 0, 0); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_BIDIR); - best=5; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BIDIR, pb, pb2, tex_pb, + &dmin, &next_block, 0, 0); } if(mb_type&MB_TYPE_DIRECT){ - copy_context_before_encode(s, &backup_s, MB_TYPE_DIRECT); s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mv_type = MV_TYPE_16X16; //FIXME s->mb_intra= 0; @@ -1797,45 +1999,39 @@ static void encode_picture(MpegEncContext *s, int picture_number) s->mv[0][0][1] = s->b_direct_forw_mv_table[xy][1]; s->mv[1][0][0] = s->b_direct_back_mv_table[xy][0]; s->mv[1][0][1] = s->b_direct_back_mv_table[xy][1]; - init_put_bits(&s->pb, bit_buf[6], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, s->b_direct_mv_table[xy][0], s->b_direct_mv_table[xy][1]); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_DIRECT); - best=6; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_DIRECT, pb, pb2, tex_pb, + &dmin, &next_block, s->b_direct_mv_table[xy][0], s->b_direct_mv_table[xy][1]); } if(mb_type&MB_TYPE_INTRA){ - copy_context_before_encode(s, &backup_s, MB_TYPE_INTRA); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; s->mb_intra= 1; s->mv[0][0][0] = 0; s->mv[0][0][1] = 0; - init_put_bits(&s->pb, bit_buf[0], 3000, NULL, NULL); - s->block= s->blocks[next_block]; - - encode_mb(s, 0, 0); - d= get_bit_count(&s->pb); - if(dpb); - dmin=d; - copy_context_after_encode(&best_s, s, MB_TYPE_INTRA); - best=0; - next_block^=1; - } + encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTRA, pb, pb2, tex_pb, + &dmin, &next_block, 0, 0); /* force cleaning of ac/dc pred stuff if needed ... */ if(s->h263_pred || s->h263_aic) s->mbintra_table[mb_x + mb_y*s->mb_width]=1; } copy_context_after_encode(s, &best_s, -1); - copy_bits(&pb, bit_buf[best], dmin); - s->pb= pb; + + pb_bits_count= get_bit_count(&s->pb); + flush_put_bits(&s->pb); + ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); + s->pb= backup_s.pb; + + if(s->data_partitioning){ + pb2_bits_count= get_bit_count(&s->pb2); + flush_put_bits(&s->pb2); + ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); + s->pb2= backup_s.pb2; + + tex_pb_bits_count= get_bit_count(&s->tex_pb); + flush_put_bits(&s->tex_pb); + ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); + s->tex_pb= backup_s.tex_pb; + } s->last_bits= get_bit_count(&s->pb); } else { int motion_x, motion_y; @@ -1854,6 +2050,16 @@ static void encode_picture(MpegEncContext *s, int picture_number) motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; break; + case MB_TYPE_INTER4V: + s->mv_dir = MV_DIR_FORWARD; + s->mv_type = MV_TYPE_8X8; + s->mb_intra= 0; + for(i=0; i<4; i++){ + s->mv[0][i][0] = s->motion_val[s->block_index[i]][0]; + s->mv[0][i][1] = s->motion_val[s->block_index[i]][1]; + } + motion_x= motion_y= 0; + break; case MB_TYPE_DIRECT: s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mb_intra= 0; @@ -1900,6 +2106,7 @@ static void encode_picture(MpegEncContext *s, int picture_number) } MPV_decode_mb(s, s->block); +//printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_width, get_bit_count(&s->pb)); } @@ -1913,14 +2120,20 @@ static void encode_picture(MpegEncContext *s, int picture_number) } //fprintf(stderr, "\nMB line: %d\tSize: %u\tAvg. Size: %u", s->mb_y, // (s->pb.buf_ptr - s->ptr_last_mb_line), s->mb_line_avgsize); - s->first_gob_line = 0; + if(s->codec_id!=CODEC_ID_MPEG4) s->first_slice_line = 0; //FIXME clean } } emms_c(); - if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type == I_TYPE) + if(s->codec_id==CODEC_ID_MPEG4 && s->data_partitioning && s->pict_type!=B_TYPE) + ff_mpeg4_merge_partitions(s); + + if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) msmpeg4_encode_ext_header(s); + if(s->codec_id==CODEC_ID_MPEG4) + ff_mpeg4_stuffing(&s->pb); + //if (s->gob_number) // fprintf(stderr,"\nNumber of GOB: %d", s->gob_number); @@ -1938,30 +2151,14 @@ static void encode_picture(MpegEncContext *s, int picture_number) static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, - int qscale) + int qscale, int *overflow) { int i, j, level, last_non_zero, q; const int *qmat; - int minLevel, maxLevel; - - if(s->avctx!=NULL && s->avctx->codec->id==CODEC_ID_MPEG4){ - /* mpeg4 */ - minLevel= -2048; - maxLevel= 2047; - }else if(s->out_format==FMT_MPEG1){ - /* mpeg1 */ - minLevel= -255; - maxLevel= 255; - }else if(s->out_format==FMT_MJPEG){ - /* (m)jpeg */ - minLevel= -1023; - maxLevel= 1023; - }else{ - /* h263 / msmpeg4 */ - minLevel= -128; - maxLevel= 127; - } - + int bias; + int max=0; + unsigned int threshold1, threshold2; + av_fdct (block); /* we need this permutation so that we correct the IDCT @@ -1969,81 +2166,54 @@ static int dct_quantize_c(MpegEncContext *s, block_permute(block); if (s->mb_intra) { - if (n < 4) - q = s->y_dc_scale; - else - q = s->c_dc_scale; - q = q << 3; - + if (!s->h263_aic) { + if (n < 4) + q = s->y_dc_scale; + else + q = s->c_dc_scale; + q = q << 3; + } else + /* For AIC we skip quant/dequant of INTRADC */ + q = 1 << 3; + /* note: block[0] is assumed to be positive */ block[0] = (block[0] + (q >> 1)) / q; i = 1; last_non_zero = 0; - if (s->out_format == FMT_H263) { - qmat = s->q_non_intra_matrix; - } else { - qmat = s->q_intra_matrix; - } + qmat = s->q_intra_matrix[qscale]; + bias= s->intra_quant_bias<<(QMAT_SHIFT - 3 - QUANT_BIAS_SHIFT); } else { i = 0; last_non_zero = -1; - qmat = s->q_non_intra_matrix; + qmat = s->q_inter_matrix[qscale]; + bias= s->inter_quant_bias<<(QMAT_SHIFT - 3 - QUANT_BIAS_SHIFT); } + threshold1= (1<<(QMAT_SHIFT - 3)) - bias - 1; + threshold2= threshold1<<1; for(;i<64;i++) { j = zigzag_direct[i]; level = block[j]; level = level * qmat[j]; -#ifdef PARANOID - { - static int count = 0; - int level1, level2, qmat1; - double val; - if (qmat == s->q_non_intra_matrix) { - qmat1 = default_non_intra_matrix[j] * s->qscale; - } else { - qmat1 = default_intra_matrix[j] * s->qscale; - } - if (av_fdct != jpeg_fdct_ifast) - val = ((double)block[j] * 8.0) / (double)qmat1; - else - val = ((double)block[j] * 8.0 * 2048.0) / - ((double)qmat1 * aanscales[j]); - level1 = (int)val; - level2 = level / (1 << (QMAT_SHIFT - 3)); - if (level1 != level2) { - fprintf(stderr, "%d: quant error qlevel=%d wanted=%d level=%d qmat1=%d qmat=%d wantedf=%0.6f\n", - count, level2, level1, block[j], qmat1, qmat[j], - val); - count++; - } - } -#endif - /* XXX: slight error for the low range. Test should be equivalent to - (level <= -(1 << (QMAT_SHIFT - 3)) || level >= (1 << - (QMAT_SHIFT - 3))) - */ - if (((level << (31 - (QMAT_SHIFT - 3))) >> (31 - (QMAT_SHIFT - 3))) != - level) { - level = level / (1 << (QMAT_SHIFT - 3)); - /* XXX: currently, this code is not optimal. the range should be: - mpeg1: -255..255 - mpeg2: -2048..2047 - h263: -128..127 - mpeg4: -2048..2047 - */ - if (level > maxLevel) - level = maxLevel; - else if (level < minLevel) - level = minLevel; - - block[j] = level; +// if( bias+level >= (1<<(QMAT_SHIFT - 3)) +// || bias-level >= (1<<(QMAT_SHIFT - 3))){ + if(((unsigned)(level+threshold1))>threshold2){ + if(level>0){ + level= (bias + level)>>(QMAT_SHIFT - 3); + block[j]= level; + }else{ + level= (bias - level)>>(QMAT_SHIFT - 3); + block[j]= -level; + } + max |=level; last_non_zero = i; - } else { - block[j] = 0; + }else{ + block[j]=0; } } + *overflow= s->max_qcoeff < max; //overflow might have happend + return last_non_zero; } @@ -2085,7 +2255,7 @@ static void dct_unquantize_mpeg1_c(MpegEncContext *s, } } else { i = 0; - quant_matrix = s->non_intra_matrix; + quant_matrix = s->inter_matrix; for(;inon_intra_matrix; + quant_matrix = s->inter_matrix; for(;idc_val[0][mb_x*2+1 + (i&1) + (mb_y*2+1 + (i>>1))*(s->mb_width*2+2)]; + for(y=0; y<8; y++){ + int x; + for(x=0; x<8; x++){ + dest_y[x + (i&1)*8 + (y + (i>>1)*8)*s->linesize]= dc/8; + } + } + } + dcb = s->dc_val[1][mb_x+1 + (mb_y+1)*(s->mb_width+2)]; + dcr= s->dc_val[2][mb_x+1 + (mb_y+1)*(s->mb_width+2)]; + for(y=0; y<8; y++){ + int x; + for(x=0; x<8; x++){ + dest_cb[x + y*(s->linesize>>1)]= dcb/8; + dest_cr[x + y*(s->linesize>>1)]= dcr/8; + } + } +} + +/** + * will conceal past errors, and allso drop b frames if needed + * + */ +void ff_conceal_past_errors(MpegEncContext *s, int unknown_pos) +{ + int mb_x= s->mb_x; + int mb_y= s->mb_y; + int mb_dist=0; + int i, intra_count=0, inter_count=0; + int intra_conceal= s->msmpeg4_version ? 50 : 50; //FIXME finetune + int inter_conceal= s->msmpeg4_version ? 50 : 50; + + // for last block + if(mb_x>=s->mb_width) mb_x= s->mb_width -1; + if(mb_y>=s->mb_height) mb_y= s->mb_height-1; + + if(s->decoding_error==0 && unknown_pos){ + if(s->data_partitioning && s->pict_type!=B_TYPE) + s->decoding_error= DECODING_AC_LOST; + else + s->decoding_error= DECODING_DESYNC; + } + + if(s->decoding_error==DECODING_DESYNC && s->pict_type!=B_TYPE) s->next_p_frame_damaged=1; + + for(i=mb_x + mb_y*s->mb_width; i>=0; i--){ + if(s->mbintra_table[i]) intra_count++; + else inter_count++; + } + + if(s->decoding_error==DECODING_AC_LOST){ + intra_conceal*=2; + inter_conceal*=2; + }else if(s->decoding_error==DECODING_ACDC_LOST){ + intra_conceal*=2; + inter_conceal*=2; + } + + if(unknown_pos && (intra_countmb_num; +// printf("%d %d\n",intra_count, inter_count); + } + + fprintf(stderr, "concealing errors\n"); + + /* for all MBs from the current one back until the last resync marker */ + for(; mb_y>=0 && mb_y>=s->resync_mb_y; mb_y--){ + for(; mb_x>=0; mb_x--){ + uint8_t *dest_y = s->current_picture[0] + (mb_y * 16* s->linesize ) + mb_x * 16; + uint8_t *dest_cb = s->current_picture[1] + (mb_y * 8 * (s->linesize >> 1)) + mb_x * 8; + uint8_t *dest_cr = s->current_picture[2] + (mb_y * 8 * (s->linesize >> 1)) + mb_x * 8; + int mb_x_backup= s->mb_x; //FIXME pass xy to mpeg_motion + int mb_y_backup= s->mb_y; + s->mb_x=mb_x; + s->mb_y=mb_y; + if(s->mbintra_table[mb_y*s->mb_width + mb_x] && mb_distdecoding_error==DECODING_AC_LOST){ + remove_ac(s, dest_y, dest_cb, dest_cr, mb_x, mb_y); +// printf("remove ac to %d %d\n", mb_x, mb_y); + }else{ + mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, + s->last_picture, 0, 0, put_pixels_tab, + 0/*mx*/, 0/*my*/, 16); + } + } + else if(!s->mbintra_table[mb_y*s->mb_width + mb_x] && mb_distdecoding_error!=DECODING_DESYNC){ + int xy= mb_x*2+1 + (mb_y*2+1)*(s->mb_width*2+2); + mx= s->motion_val[ xy ][0]; + my= s->motion_val[ xy ][1]; + } + + mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, + s->last_picture, 0, 0, put_pixels_tab, + mx, my, 16); + } + s->mb_x= mb_x_backup; + s->mb_y= mb_y_backup; + + if(mb_x== s->resync_mb_x && mb_y== s->resync_mb_y) return; + if(!s->mbskip_table[mb_x + mb_y*s->mb_width]) mb_dist++; + } + mb_x=s->mb_width-1; + } +} + AVCodec mpeg1video_encoder = { "mpeg1video", CODEC_TYPE_VIDEO, @@ -2306,3 +2589,23 @@ AVCodec msmpeg4v3_encoder = { MPV_encode_picture, MPV_encode_end, }; + +AVCodec wmv1_encoder = { + "wmv1", + CODEC_TYPE_VIDEO, + CODEC_ID_WMV1, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, +}; + +AVCodec wmv2_encoder = { + "wmv2", + CODEC_TYPE_VIDEO, + CODEC_ID_WMV2, + sizeof(MpegEncContext), + MPV_encode_init, + MPV_encode_picture, + MPV_encode_end, +};