* XVideo Motion Compensation
* Copyright (c) 2003 Ivan Kalvachev
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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
* Lesser General Public License for more details.
*
* 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
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <limits.h>
#undef NDEBUG
#include <assert.h>
-#ifdef USE_FASTMEMCPY
-#include "fastmemcpy.h"
-#endif
-
-#ifdef HAVE_XVMC
-
-//X11 includes are in the xvmc_render.h
-//by replacing it with none-X one
+//X11 includes are in xvmc_render.h
+//by replacing it with non-X one
//XvMC emulation could be performed
#include "xvmc_render.h"
//#include "xvmc_debug.h"
//set s->block
-inline void XVMC_init_block(MpegEncContext *s){
+void XVMC_init_block(MpegEncContext *s){
xvmc_render_state_t * render;
render = (xvmc_render_state_t*)s->current_picture.data[2];
assert(render != NULL);
if( (render == NULL) || (render->magic != MP_XVMC_RENDER_MAGIC) ){
assert(0);
- return;//make sure that this is render packet
+ return;//make sure that this is a render packet
}
s->block =(DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64);
}
}
}
-//these functions should be called on every new field or/and frame
-//They should be safe if they are called few times for same field!
+//These functions should be called on every new field and/or frame.
+//They should be safe if they are called a few times for the same field!
int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx){
xvmc_render_state_t * render,* last, * next;
render->p_past_surface = NULL;
switch(s->pict_type){
- case I_TYPE:
+ case FF_I_TYPE:
return 0;// no prediction from other frames
- case B_TYPE:
+ case FF_B_TYPE:
next = (xvmc_render_state_t*)s->next_picture.data[2];
assert(next!=NULL);
assert(next->state & MP_XVMC_STATE_PREDICTION);
if(next->magic != MP_XVMC_RENDER_MAGIC) return -1;
render->p_future_surface = next->p_surface;
//no return here, going to set forward prediction
- case P_TYPE:
+ case FF_P_TYPE:
last = (xvmc_render_state_t*)s->last_picture.data[2];
if(last == NULL)// && !s->first_field)
last = render;//predict second field from the first
if(s->encoding){
av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n");
- return -1;
+ return;
}
//from MPV_decode_mb(),
s->mb_skipped = 0;
- // do I need to export quant when I could not perform postprocessing?
- // anyway, it doesn't hurrt
+ // Do I need to export quant when I could not perform postprocessing?
+ // Anyway, it doesn't hurt.
s->current_picture.qscale_table[mb_xy] = s->qscale;
//START OF XVMC specific code
mv_block->x = s->mb_x;
mv_block->y = s->mb_y;
mv_block->dct_type = s->interlaced_dct;//XVMC_DCT_TYPE_FRAME/FIELD;
-// mv_block->motion_type = 0; //zero to silense warnings
+// mv_block->motion_type = 0; //zero to silence warnings
if(s->mb_intra){
mv_block->macroblock_type = XVMC_MB_TYPE_INTRA;//no MC, all done
}else{
mv_block->motion_vertical_field_select = 0;
-//set correct field referenses
+//set correct field references
if(s->mv_type == MV_TYPE_FIELD || s->mv_type == MV_TYPE_16X8){
if( s->field_select[0][0] ) mv_block->motion_vertical_field_select|=1;
if( s->field_select[1][0] ) mv_block->motion_vertical_field_select|=2;
}
if(s->flags & CODEC_FLAG_GRAY){
- if(s->mb_intra){//intra frames are alwasy full chroma block
+ if(s->mb_intra){//intra frames are always full chroma block
for(i=4; i<blocks_per_mb; i++){
memset(s->pblocks[i],0,sizeof(short)*8*8);//so we need to clear them
if(!render->unsigned_intra)
}
}else{
cbp&= 0xf << (blocks_per_mb - 4);
- blocks_per_mb = 4;//Luminance blocks only
+ blocks_per_mb = 4;//luminance blocks only
}
}
mv_block->coded_block_pattern = cbp;
for(i=0; i<blocks_per_mb; i++){
if(s->block_last_index[i] >= 0){
- // i do not have unsigned_intra MOCO to test, hope it is OK
+ // I do not have unsigned_intra MOCO to test, hope it is OK.
if( (s->mb_intra) && ( render->idct || (!render->idct && !render->unsigned_intra)) )
s->pblocks[i][0]-=1<<10;
if(!render->idct){
// DumpMBlockInfo(mv_block);
}
-
-#endif
projects / ffmpeg / blobdiff