/*
* 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 <michaelni@gmx.at>
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
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;
+static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
+ int src_x, int src_y, int w, int h);
#define EDGE_WIDTH 16
for(qscale=1; qscale<32; qscale++){
int i;
- if (av_fdct == jpeg_fdct_ifast) {
+ if (av_fdct == fdct_ifast) {
for(i=0;i<64;i++) {
const int j= block_permute_op(i);
/* 16 <= qscale * quant_matrix[i] <= 7905 */
}
}
}
+// 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)
#ifdef HAVE_MMX
MPV_common_init_mmx(s);
+#endif
+#ifdef ARCH_ALPHA
+ MPV_common_init_axp(s);
#endif
//setup default unquantizers (mpeg4 might change it later)
if(s->out_format == FMT_H263)
s->mb_width = (s->width + 15) / 16;
s->mb_height = (s->height + 15) / 16;
s->mb_num = s->mb_width * s->mb_height;
- s->linesize = s->mb_width * 16 + 2 * EDGE_WIDTH;
+ if(!(s->flags&CODEC_FLAG_DR1)){
+ s->linesize = s->mb_width * 16 + 2 * EDGE_WIDTH;
+ s->uvlinesize = s->mb_width * 8 + EDGE_WIDTH;
- for(i=0;i<3;i++) {
+ for(i=0;i<3;i++) {
int w, h, shift, pict_start;
w = s->linesize;
h = s->mb_height * 16 + 2 * EDGE_WIDTH;
shift = (i == 0) ? 0 : 1;
- c_size = (w >> shift) * (h >> shift);
- pict_start = (w >> shift) * (EDGE_WIDTH >> shift) + (EDGE_WIDTH >> shift);
+ c_size = (s->linesize>>shift) * (h >> shift);
+ pict_start = (s->linesize>>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 || 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 */
- pict = av_mallocz(c_size);
- if (pict == NULL)
- goto fail;
+ 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);
}
+ }
+ s->ip_buffer_count= 2;
}
+ CHECKED_ALLOCZ(s->edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance
+
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<REORDER_BUFFER_SIZE; j++){
shift = (i == 0) ? 0 : 1;
c_size = (w >> 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) {
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;i<size;i++)
s->dc_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 */
- s->bitstream_buffer= av_mallocz(BITSTREAM_BUFFER_SIZE);
- if (!s->bitstream_buffer)
- goto fail;
+ 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];
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);
- CHECK_FREE(s->bitstream_buffer);
+ 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);
+ av_freep(&s->edge_emu_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]);
+ if(!(s->flags&CODEC_FLAG_DR1)){
+ av_freep(&s->last_picture_base[i]);
+ av_freep(&s->next_picture_base[i]);
+ av_freep(&s->aux_picture_base[i]);
+ }
+ s->last_picture_base[i]=
+ s->next_picture_base[i]=
+ s->aux_picture_base [i] = NULL;
+ s->last_picture[i]=
+ s->next_picture[i]=
+ s->aux_picture [i] = NULL;
+
for(j=0; j<REORDER_BUFFER_SIZE; j++){
- CHECK_FREE(s->picture_buffer[j][i]);
+ av_freep(&s->picture_buffer[j][i]);
}
}
s->context_initialized = 0;
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;
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->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->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)
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){
}
s->mv_penalty= default_mv_penalty;
s->fcode_tab= default_fcode_tab;
-
+ s->y_dc_scale_table=
+ s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
+
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;
/* init default q matrix */
for(i=0;i<64;i++) {
if(s->out_format == FMT_H263)
- s->intra_matrix[i] = default_non_intra_matrix[i];
+ s->intra_matrix[i] = ff_mpeg1_default_non_intra_matrix[i];
else
- s->intra_matrix[i] = default_intra_matrix[i];
+ s->intra_matrix[i] = ff_mpeg1_default_intra_matrix[i];
- s->inter_matrix[i] = default_non_intra_matrix[i];
+ s->inter_matrix[i] = ff_mpeg1_default_non_intra_matrix[i];
}
/* precompute matrix */
}
/* generic function for encode/decode called before a frame is coded/decoded */
-void MPV_frame_start(MpegEncContext *s)
+void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
{
int i;
UINT8 *tmp;
s->mb_skiped = 0;
+ s->decoding_error=0;
+ avctx->mbskip_table= s->mbskip_table;
+
+ if(avctx->flags&CODEC_FLAG_DR1){
+ int i;
+ avctx->get_buffer_callback(avctx, s->width, s->height, s->pict_type);
+
+ s->linesize = avctx->dr_stride;
+ s->uvlinesize= avctx->dr_uvstride;
+ s->ip_buffer_count= avctx->dr_ip_buffer_count;
+ }
+ avctx->dr_ip_buffer_count= s->ip_buffer_count;
+
if (s->pict_type == B_TYPE) {
for(i=0;i<3;i++) {
+ if(avctx->flags&CODEC_FLAG_DR1)
+ s->aux_picture[i]= avctx->dr_buffer[i];
+
+ //FIXME the following should never be needed, the decoder should drop b frames if no reference is available
+ if(s->next_picture[i]==NULL)
+ s->next_picture[i]= s->aux_picture[i];
+ if(s->last_picture[i]==NULL)
+ s->last_picture[i]= s->next_picture[i];
+
s->current_picture[i] = s->aux_picture[i];
}
} else {
for(i=0;i<3;i++) {
/* swap next and last */
- tmp = s->last_picture[i];
+ if(avctx->flags&CODEC_FLAG_DR1)
+ tmp= avctx->dr_buffer[i];
+ else
+ tmp = s->last_picture[i];
+
s->last_picture[i] = s->next_picture[i];
s->next_picture[i] = tmp;
s->current_picture[i] = tmp;
+
+ s->last_dr_opaque= s->next_dr_opaque;
+ s->next_dr_opaque= avctx->dr_opaque_frame;
+
+ if(s->has_b_frames && s->last_dr_opaque && s->codec_id!=CODEC_ID_SVQ1)
+ avctx->dr_opaque_frame= s->last_dr_opaque;
+ else
+ avctx->dr_opaque_frame= s->next_dr_opaque;
}
}
}
/* 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->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
+ 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);
+ draw_edges(s->current_picture[1], s->uvlinesize, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2);
+ draw_edges(s->current_picture[2], s->uvlinesize, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2);
}else{
/* mpeg4? / opendivx / xvid */
draw_edges(s->current_picture[0], s->linesize, s->width, s->height, EDGE_WIDTH);
- draw_edges(s->current_picture[1], s->linesize/2, s->width/2, s->height/2, EDGE_WIDTH/2);
- draw_edges(s->current_picture[2], s->linesize/2, s->width/2, s->height/2, EDGE_WIDTH/2);
+ draw_edges(s->current_picture[1], s->uvlinesize, s->width/2, s->height/2, EDGE_WIDTH/2);
+ draw_edges(s->current_picture[2], s->uvlinesize, s->width/2, s->height/2, EDGE_WIDTH/2);
}
}
emms_c();
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;
}
//printf("index:%d type:%d strides: %d %d\n", index, s->input_pict_type, pict->linesize[0], s->linesize);
if( (index==0 || (s->flags&CODEC_FLAG_INPUT_PRESERVED))
&& pict->linesize[0] == s->linesize
- && pict->linesize[1] == s->linesize>>1
- && pict->linesize[2] == s->linesize>>1){
+ && pict->linesize[1] == s->uvlinesize
+ && pict->linesize[2] == s->uvlinesize){
//printf("ptr\n");
for(i=0; i<3; i++){
s->coded_order[index].picture[i]= pict->data[i];
s->picture_in_gop_number= s->coded_order[0].picture_in_gop_number;
s->picture_number= s->coded_order[0].picture_number;
- MPV_frame_start(s);
+ MPV_frame_start(s, avctx);
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;
if(s->flags&CODEC_FLAG_PASS1)
ff_write_pass1_stats(s);
+
}
s->input_picture_number++;
int h)
{
UINT8 *ptr;
- int offset, src_x, src_y, linesize;
+ int offset, src_x, src_y, linesize, uvlinesize;
int motion_x, motion_y;
+ int emu=0;
if(s->real_sprite_warping_points>1) printf("more than 1 warp point isnt supported\n");
motion_x= s->sprite_offset[0][0];
motion_y =0;
linesize = s->linesize;
+ uvlinesize = s->uvlinesize;
ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
dest_y+=dest_offset;
+ if(s->flags&CODEC_FLAG_EMU_EDGE){
+ if(src_x<0 || src_y<0 || src_x + (motion_x&15) + 16 > s->width
+ || src_y + (motion_y&15) + h > s->height){
+ emulated_edge_mc(s, ptr, linesize, 17, h+1, src_x, src_y, s->width, s->height);
+ ptr= s->edge_emu_buffer;
+ emu=1;
+ }
+ }
gmc1(dest_y , ptr , linesize, h, motion_x&15, motion_y&15, s->no_rounding);
gmc1(dest_y+8, ptr+8, linesize, h, motion_x&15, motion_y&15, s->no_rounding);
if (src_y == s->height>>1)
motion_y =0;
- offset = (src_y * linesize>>1) + src_x + (src_offset>>1);
+ offset = (src_y * uvlinesize) + src_x + (src_offset>>1);
ptr = ref_picture[1] + offset;
- gmc1(dest_cb + (dest_offset>>1), ptr, linesize>>1, h>>1, motion_x&15, motion_y&15, s->no_rounding);
+ if(emu){
+ emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ gmc1(dest_cb + (dest_offset>>1), ptr, uvlinesize, h>>1, motion_x&15, motion_y&15, s->no_rounding);
+
ptr = ref_picture[2] + offset;
- gmc1(dest_cr + (dest_offset>>1), ptr, linesize>>1, h>>1, motion_x&15, motion_y&15, s->no_rounding);
+ if(emu){
+ emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ gmc1(dest_cr + (dest_offset>>1), ptr, uvlinesize, h>>1, motion_x&15, motion_y&15, s->no_rounding);
return;
}
+static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int block_w, int block_h,
+ int src_x, int src_y, int w, int h){
+ int x, y;
+ int start_y, start_x, end_y, end_x;
+ UINT8 *buf= s->edge_emu_buffer;
+#if 0
+ if(s->codec_id!=CODEC_ID_MPEG4 || s->divx_version>=500){
+ if(block_w < 10){
+ w= (w+7)&(~7);
+ h= (h+7)&(~7);
+ }else{
+ w= (w+15)&(~15);
+ h= (h+15)&(~15);
+ }
+ }
+#endif
+ if(src_y>= h){
+ src+= (h-1-src_y)*linesize;
+ src_y=h-1;
+ }else if(src_y<=-block_h){
+ src+= (1-block_h-src_y)*linesize;
+ src_y=1-block_h;
+ }
+ if(src_x>= w){
+ src+= (w-1-src_x);
+ src_x=w-1;
+ }else if(src_x<=-block_w){
+ src+= (1-block_w-src_x);
+ src_x=1-block_w;
+ }
+
+ start_y= MAX(0, -src_y);
+ start_x= MAX(0, -src_x);
+ end_y= MIN(block_h, h-src_y);
+ end_x= MIN(block_w, w-src_x);
+
+ // copy existing part
+ for(y=start_y; y<end_y; y++){
+ for(x=start_x; x<end_x; x++){
+ buf[x + y*linesize]= src[x + y*linesize];
+ }
+ }
+
+ //top
+ for(y=0; y<start_y; y++){
+ for(x=start_x; x<end_x; x++){
+ buf[x + y*linesize]= buf[x + start_y*linesize];
+ }
+ }
+
+ //bottom
+ for(y=end_y; y<block_h; y++){
+ for(x=start_x; x<end_x; x++){
+ buf[x + y*linesize]= buf[x + (end_y-1)*linesize];
+ }
+ }
+
+ for(y=0; y<block_h; y++){
+ //left
+ for(x=0; x<start_x; x++){
+ buf[x + y*linesize]= buf[start_x + y*linesize];
+ }
+
+ //right
+ for(x=end_x; x<block_w; x++){
+ buf[x + y*linesize]= buf[end_x - 1 + y*linesize];
+ }
+ }
+}
+
+
/* apply one mpeg motion vector to the three components */
static inline void mpeg_motion(MpegEncContext *s,
UINT8 *dest_y, UINT8 *dest_cb, UINT8 *dest_cr,
int motion_x, int motion_y, int h)
{
UINT8 *ptr;
- int dxy, offset, mx, my, src_x, src_y, height, linesize;
+ int dxy, offset, mx, my, src_x, src_y, height, linesize, uvlinesize;
+ int emu=0;
+
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);
src_y = clip(src_y, -16, height);
if (src_y == height)
dxy &= ~2;
- linesize = s->linesize << field_based;
+ linesize = s->linesize << field_based;
+ uvlinesize = s->uvlinesize << field_based;
ptr = ref_picture[0] + (src_y * linesize) + (src_x) + src_offset;
dest_y += dest_offset;
+
+ if(s->flags&CODEC_FLAG_EMU_EDGE){
+ if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 16 > s->width
+ || src_y + (motion_y&1) + h > height){
+ emulated_edge_mc(s, ptr, linesize, 17, h+1, src_x, src_y, s->width, height);
+ ptr= s->edge_emu_buffer;
+ emu=1;
+ }
+ }
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)
src_y = clip(src_y, -8, height >> 1);
if (src_y == (height >> 1))
dxy &= ~2;
-
- offset = (src_y * (linesize >> 1)) + src_x + (src_offset >> 1);
+ offset = (src_y * uvlinesize) + src_x + (src_offset >> 1);
ptr = ref_picture[1] + offset;
- pix_op[dxy](dest_cb + (dest_offset >> 1), ptr, linesize >> 1, h >> 1);
+ if(emu){
+ emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ pix_op[dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
+
ptr = ref_picture[2] + offset;
- pix_op[dxy](dest_cr + (dest_offset >> 1), ptr, linesize >> 1, h >> 1);
+ if(emu){
+ emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ pix_op[dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
}
static inline void qpel_motion(MpegEncContext *s,
{
UINT8 *ptr;
int dxy, offset, mx, my, src_x, src_y, height, linesize;
+ int emu=0;
dxy = ((motion_y & 3) << 2) | (motion_x & 3);
src_x = s->mb_x * 16 + (motion_x >> 2);
ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
dest_y += dest_offset;
//printf("%d %d %d\n", src_x, src_y, dxy);
+
+ if(s->flags&CODEC_FLAG_EMU_EDGE){
+ if(src_x<0 || src_y<0 || src_x + (motion_x&3) + 16 > s->width
+ || src_y + (motion_y&3) + h > height){
+ emulated_edge_mc(s, ptr, linesize, 17, h+1, src_x, src_y, s->width, height);
+ ptr= s->edge_emu_buffer;
+ emu=1;
+ }
+ }
qpix_op[dxy](dest_y , ptr , linesize, linesize, motion_x&3, motion_y&3);
qpix_op[dxy](dest_y + 8, ptr + 8, linesize, linesize, motion_x&3, motion_y&3);
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);
if (src_y == (height >> 1))
dxy &= ~2;
- offset = (src_y * (linesize >> 1)) + src_x + (src_offset >> 1);
+ offset = (src_y * s->uvlinesize) + src_x + (src_offset >> 1);
ptr = ref_picture[1] + offset;
- pix_op[dxy](dest_cb + (dest_offset >> 1), ptr, linesize >> 1, h >> 1);
+ if(emu){
+ emulated_edge_mc(s, ptr, s->uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ pix_op[dxy](dest_cb + (dest_offset >> 1), ptr, s->uvlinesize, h >> 1);
+
ptr = ref_picture[2] + offset;
- pix_op[dxy](dest_cr + (dest_offset >> 1), ptr, linesize >> 1, h >> 1);
+ if(emu){
+ emulated_edge_mc(s, ptr, s->uvlinesize, 9, (h>>1)+1, src_x, src_y, s->width>>1, height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ pix_op[dxy](dest_cr + (dest_offset >> 1), ptr, s->uvlinesize, h >> 1);
}
int dxy, offset, mx, my, src_x, src_y, motion_x, motion_y;
int mb_x, mb_y, i;
UINT8 *ptr, *dest;
+ int emu=0;
mb_x = s->mb_x;
mb_y = s->mb_y;
dxy &= ~2;
ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
+ if(s->flags&CODEC_FLAG_EMU_EDGE){
+ if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 8 > s->width
+ || src_y + (motion_y&1) + 8 > s->height){
+ emulated_edge_mc(s, ptr, s->linesize, 9, 9, src_x, src_y, s->width, s->height);
+ ptr= s->edge_emu_buffer;
+ }
+ }
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;
if (src_y == s->height/2)
dxy &= ~2;
- offset = (src_y * (s->linesize >> 1)) + src_x;
+ offset = (src_y * (s->uvlinesize)) + src_x;
ptr = ref_picture[1] + offset;
- pix_op[dxy](dest_cb, ptr, s->linesize >> 1, 8);
+ if(s->flags&CODEC_FLAG_EMU_EDGE){
+ if(src_x<0 || src_y<0 || src_x + (dxy &1) + 8 > s->width >>1
+ || src_y + (dxy>>1) + 8 > s->height>>1){
+ emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ emu=1;
+ }
+ }
+ pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8);
+
ptr = ref_picture[2] + offset;
- pix_op[dxy](dest_cr, ptr, s->linesize >> 1, 8);
+ if(emu){
+ emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8);
break;
case MV_TYPE_FIELD:
if (s->picture_structure == PICT_FRAME) {
{
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[] */
static inline void add_dct(MpegEncContext *s,
DCTELEM *block, int i, UINT8 *dest, int line_size)
{
- /* skip dequant / idct if we are really late ;) */
- if(s->hurry_up>1) return;
+ if (s->block_last_index[i] >= 0) {
+ 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) {
- if (!s->mpeg2)
- if(s->encoding || (!s->h263_msmpeg4))
- s->dct_unquantize(s, block, i, s->qscale);
+ s->dct_unquantize(s, block, i, s->qscale);
- ff_idct (block);
- add_pixels_clamped(block, dest, line_size);
+ ff_idct_add (dest, line_size, block);
}
}
+/**
+ * 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
decoder or after it has been encoded by the encoder.
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
+ /* even more obsolete, exists for mplayer xp only */
+ if(s->avctx->quant_store) s->avctx->quant_store[mb_y*s->avctx->qstride+mb_x] = s->qscale;
#endif
+ s->qscale_table[mb_xy]= s->qscale;
/* 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;
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;
+
+ (*mbskip_ptr) ++; /* indicate that this time we skiped it */
+ if(*mbskip_ptr >99) *mbskip_ptr= 99;
+
/* if previous was skipped too, then nothing to do !
skip only during decoding as we might trash the buffers during encoding a bit */
- if (*mbskip_ptr != 0 && !s->encoding)
+ if (*mbskip_ptr >= s->ip_buffer_count && !s->encoding)
goto the_end;
- *mbskip_ptr = 1; /* indicate that this time we skiped it */
} else {
*mbskip_ptr = 0; /* not skipped */
}
}
- 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;
+ dest_y = s->current_picture [0] + (mb_y * 16* s->linesize ) + mb_x * 16;
+ dest_cb = s->current_picture[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
+ dest_cr = s->current_picture[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
if (s->interlaced_dct) {
dct_linesize = s->linesize * 2;
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;
}
}
- /* 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->encoding || !(s->mpeg2 || s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG4)){
+ 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->uvlinesize);
+ add_dequant_dct(s, block[5], 5, dest_cr, s->uvlinesize);
+ }
+ } 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->uvlinesize);
+ add_dct(s, block[5], 5, dest_cr, s->uvlinesize);
+ }
+ }
} else {
/* dct only in intra block */
put_dct(s, block[0], 0, dest_y, dct_linesize);
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->uvlinesize);
+ put_dct(s, block[5], 5, dest_cr, s->uvlinesize);
+ }
}
}
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 mb_x= s->mb_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;
dct_offset = s->linesize * 8;
}
#endif
+ for(i=0; i<6; i++) skip_dct[i]=0;
if (s->mb_intra) {
UINT8 *ptr;
int wrap;
+ int emu=0;
wrap = s->linesize;
ptr = s->new_picture[0] + (mb_y * 16 * wrap) + mb_x * 16;
+ if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
+ emulated_edge_mc(s, ptr, wrap, 16, 16, mb_x*16, mb_y*16, s->width, s->height);
+ ptr= s->edge_emu_buffer;
+ emu=1;
+ }
get_pixels(s->block[0], ptr , wrap);
get_pixels(s->block[1], ptr + 8, wrap);
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;
+ if(emu){
+ emulated_edge_mc(s, ptr, wrap, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ 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;
+ if(emu){
+ emulated_edge_mc(s, ptr, wrap, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+ ptr= s->edge_emu_buffer;
+ }
+ 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;
+ int emu=0;
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;
+ dest_cb = s->current_picture[1] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8;
+ dest_cr = s->current_picture[2] + (mb_y * 8 * (s->uvlinesize)) + 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;
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);
+ if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
+ emulated_edge_mc(s, ptr_y, wrap_y, 16, 16, mb_x*16, mb_y*16, s->width, s->height);
+ ptr_y= s->edge_emu_buffer;
+ emu=1;
+ }
+ 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{
+ if(emu){
+ emulated_edge_mc(s, ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+ ptr_cb= s->edge_emu_buffer;
+ }
+ diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c);
+ if(emu){
+ emulated_edge_mc(s, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+ ptr_cr= s->edge_emu_buffer;
+ }
+ 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
}
#endif
/* DCT & quantize */
- if (s->h263_pred && s->msmpeg4_version!=2) {
- h263_dc_scale(s);
- } else if (s->h263_aic) {
- s->y_dc_scale = 2*s->qscale;
- s->c_dc_scale = 2*s->qscale;
- } 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;
}
}else{
for(i=0;i<6;i++) {
- int overflow;
- s->block_last_index[i] = dct_quantize(s, s->block[i], i, s->qscale, &overflow);
+ 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]);
+ 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);
+ }
+
+ 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 */
}
}
-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<bytes; i++) put_bits(pb, 16, be2me_16(((uint16_t*)src)[i]));
put_bits(pb, bits, be2me_16(((uint16_t*)src)[i])>>(16-bits));
-#else
- int bytes= length>>3;
- int bits= length&7;
- int i;
-
- for(i=0; i<bytes; i++) put_bits(pb, 8, src[i]);
- put_bits(pb, bits, src[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?
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));
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)
{
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;
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)
/* 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);
}
}
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);
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){
if (s->out_format == FMT_MJPEG) {
/* for mjpeg, we do include qscale in the matrix */
- s->intra_matrix[0] = default_intra_matrix[0];
+ s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
for(i=1;i<64;i++)
- s->intra_matrix[i] = (default_intra_matrix[i] * s->qscale) >> 3;
+ s->intra_matrix[i] = CLAMP_TO_8BIT((ff_mpeg1_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->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);
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;
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;
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(d<dmin){
- flush_put_bits(&s->pb);
- 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;
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(d<dmin){
- flush_put_bits(&s->pb);
- 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(d<dmin){
- flush_put_bits(&s->pb);
- 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(d<dmin){
- flush_put_bits(&s->pb);
- 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;
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(d<dmin){
- flush_put_bits(&s->pb);
- 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;
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(d<dmin){
- flush_put_bits(&s->pb);
- 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(d<dmin){
- flush_put_bits(&s->pb);
- 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;
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;
}
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));
}
}
//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);
int bias;
int max=0;
unsigned int threshold1, threshold2;
-
+
av_fdct (block);
/* we need this permutation so that we correct the IDCT
}
}
+static void remove_ac(MpegEncContext *s, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, int mb_x, int mb_y)
+{
+ int dc, dcb, dcr, y, i;
+ for(i=0; i<4; i++){
+ dc= s->dc_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->uvlinesize)]= dcb/8;
+ dest_cr[x + y*(s->uvlinesize)]= 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_count<inter_count)){
+ intra_conceal= inter_conceal= s->mb_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->uvlinesize)) + mb_x * 8;
+ uint8_t *dest_cr = s->current_picture[2] + (mb_y * 8 * (s->uvlinesize)) + 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_dist<intra_conceal){
+ if(s->decoding_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_dist<inter_conceal){
+ int mx=0;
+ int my=0;
+
+ if(s->decoding_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,
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,
+};
projects / ffmpeg / blobdiff