diff options
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 136 |
1 files changed, 48 insertions, 88 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 28ab7ba20..9600de365 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -1,8 +1,8 @@ ---- /home/melanson/projects/ffmpeg/libavcodec/avcodec.h 2005-04-02 21:53:18.000000000 -0700 -+++ libavcodec/avcodec.h 2005-04-18 21:37:53.750018024 -0600 -@@ -29,6 +29,13 @@ - #define AV_NOPTS_VALUE int64_t_C(0x8000000000000000) +--- /home/melanson/temp/ffmpeg/libavcodec/avcodec.h 2005-05-05 20:53:13.717837440 -0600 ++++ libavcodec/avcodec.h 2005-05-05 21:30:43.775776640 -0600 +@@ -30,6 +30,13 @@ #define AV_TIME_BASE 1000000 + #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} +/* FIXME: We cannot use ffmpeg's XvMC capabilities, since that would require + * linking the ffmpeg plugin against XvMC libraries, which is a bad thing, @@ -14,7 +14,7 @@ enum CodecID { CODEC_ID_NONE, CODEC_ID_MPEG1VIDEO, -@@ -2354,6 +2361,13 @@ +@@ -2352,6 +2359,13 @@ ((uint8_t*)(x))[0]) #endif @@ -28,8 +28,8 @@ #ifdef __cplusplus } #endif ---- /home/melanson/projects/ffmpeg/libavcodec/common.h 2005-04-18 12:07:13.000000000 -0600 -+++ libavcodec/common.h 2005-04-18 21:34:24.776786784 -0600 +--- /home/melanson/temp/ffmpeg/libavcodec/common.h 2005-05-05 20:53:13.720836984 -0600 ++++ libavcodec/common.h 2005-05-05 21:30:43.776776488 -0600 @@ -6,6 +6,11 @@ #ifndef COMMON_H #define COMMON_H @@ -51,9 +51,8 @@ +# endif # endif # include <assert.h> - ---- /home/melanson/projects/ffmpeg/libavcodec/dsputil.h 2005-02-04 15:45:15.000000000 -0700 -+++ libavcodec/dsputil.h 2005-04-18 21:34:24.777786632 -0600 +--- /home/melanson/temp/ffmpeg/libavcodec/dsputil.h 2005-05-05 20:53:13.734834856 -0600 ++++ libavcodec/dsputil.h 2005-05-05 21:30:43.776776488 -0600 @@ -31,6 +31,9 @@ #include "common.h" #include "avcodec.h" @@ -64,46 +63,8 @@ //#define DEBUG /* dct code */ ---- /home/melanson/projects/ffmpeg/libavcodec/mlib/dsputil_mlib.c 2004-03-14 18:19:24.000000000 -0700 -+++ libavcodec/mlib/dsputil_mlib.c 2005-04-18 21:34:24.777786632 -0600 -@@ -20,6 +20,8 @@ - #include "../dsputil.h" - #include "../mpegvideo.h" - -+#include "../../../xine-utils/xineutils.h" -+ - #include <mlib_types.h> - #include <mlib_status.h> - #include <mlib_sys.h> -@@ -419,6 +421,7 @@ - - void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx) - { -+ if (xine_mm_accel() & MM_ACCEL_MLIB) { - c->get_pixels = get_pixels_mlib; - c->diff_pixels = diff_pixels_mlib; - c->add_pixels_clamped = add_pixels_clamped_mlib; -@@ -445,10 +448,12 @@ - c->put_no_rnd_pixels_tab[1][0] = put_pixels8_mlib; - - c->bswap_buf = bswap_buf_mlib; -+ } - } - - void MPV_common_init_mlib(MpegEncContext *s) - { -+ if (xine_mm_accel() & MM_ACCEL_MLIB) { - if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){ - s->dsp.fdct = ff_fdct_mlib; - } -@@ -459,4 +464,5 @@ - s->dsp.idct = ff_idct_mlib; - s->dsp.idct_permutation_type= FF_NO_IDCT_PERM; - } -+ } - } ---- /home/melanson/projects/ffmpeg/libavcodec/motion_est.c 2005-03-26 13:24:17.000000000 -0700 -+++ libavcodec/motion_est.c 2005-04-18 21:34:24.778786480 -0600 +--- /home/melanson/temp/ffmpeg/libavcodec/motion_est.c 2005-05-05 20:53:15.023638928 -0600 ++++ libavcodec/motion_est.c 2005-05-05 21:30:43.778776184 -0600 @@ -20,6 +20,9 @@ * * new Motion Estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at> @@ -120,8 +81,8 @@ } + +#endif /* CONFIG_ENCODERS */ ---- /home/melanson/projects/ffmpeg/libavcodec/mpeg12.c 2005-04-18 12:07:13.000000000 -0600 -+++ libavcodec/mpeg12.c 2005-04-18 21:34:24.779786328 -0600 +--- /home/melanson/temp/ffmpeg/libavcodec/mpeg12.c 2005-05-05 20:53:15.191613392 -0600 ++++ libavcodec/mpeg12.c 2005-05-05 21:30:43.779776032 -0600 @@ -34,6 +34,13 @@ //#include <assert.h> @@ -136,8 +97,8 @@ /* Start codes. */ #define SEQ_END_CODE 0x000001b7 #define SEQ_START_CODE 0x000001b3 ---- /home/melanson/projects/ffmpeg/libavcodec/mpegvideo.c 2005-04-18 22:27:14.037985848 -0600 -+++ libavcodec/mpegvideo.c 2005-04-18 22:34:38.395433248 -0600 +--- /home/melanson/temp/ffmpeg/libavcodec/mpegvideo.c 2005-05-05 20:53:15.787522800 -0600 ++++ libavcodec/mpegvideo.c 2005-05-05 21:35:14.680592848 -0600 @@ -38,6 +38,14 @@ //#undef NDEBUG //#include <assert.h> @@ -153,7 +114,7 @@ #ifdef CONFIG_ENCODERS static void encode_picture(MpegEncContext *s, int picture_number); #endif //CONFIG_ENCODERS -@@ -1100,6 +1108,8 @@ +@@ -1103,6 +1111,8 @@ s->low_delay= 0; //s->max_b_frames ? 0 : 1; avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); break; @@ -162,7 +123,7 @@ case CODEC_ID_MPEG2VIDEO: s->out_format = FMT_MPEG1; s->low_delay= 0; //s->max_b_frames ? 0 : 1; -@@ -1234,6 +1244,7 @@ +@@ -1237,6 +1247,7 @@ avctx->delay=0; s->low_delay=1; break; @@ -170,15 +131,16 @@ default: return -1; } -@@ -1255,12 +1266,16 @@ +@@ -1258,6 +1269,8 @@ ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp); +/* xine: do not need this for decode or MPEG-1 encoding modes */ +#if 0 + #ifdef CONFIG_H261_ENCODER if (s->out_format == FMT_H261) ff_h261_encode_init(s); - if (s->out_format == FMT_H263) +@@ -1266,6 +1279,8 @@ h263_encode_init(s); if(s->msmpeg4_version) ff_msmpeg4_encode_init(s); @@ -187,7 +149,7 @@ if (s->out_format == FMT_MPEG1) ff_mpeg1_encode_init(s); -@@ -1309,9 +1324,12 @@ +@@ -1314,9 +1329,12 @@ ff_rate_control_uninit(s); @@ -200,7 +162,7 @@ av_freep(&avctx->extradata); -@@ -2340,8 +2358,11 @@ +@@ -2345,8 +2363,11 @@ MPV_frame_end(s); @@ -212,7 +174,7 @@ if(s->flags&CODEC_FLAG_PASS1) ff_write_pass1_stats(s); -@@ -4278,6 +4299,8 @@ +@@ -4285,6 +4306,8 @@ case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; @@ -221,7 +183,7 @@ case CODEC_ID_MPEG4: mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; case CODEC_ID_MSMPEG4V2: -@@ -4296,6 +4319,7 @@ +@@ -4305,6 +4328,7 @@ h263_encode_mb(s, s->block, motion_x, motion_y); break; case CODEC_ID_MJPEG: mjpeg_encode_mb(s, s->block); break; @@ -229,7 +191,7 @@ default: assert(0); } -@@ -4511,6 +4535,8 @@ +@@ -4520,6 +4544,8 @@ +sse(s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize); } @@ -238,7 +200,7 @@ static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ MpegEncContext *s= arg; -@@ -4554,6 +4580,7 @@ +@@ -4563,6 +4589,7 @@ } return 0; } @@ -246,7 +208,7 @@ static int mb_var_thread(AVCodecContext *c, void *arg){ MpegEncContext *s= arg; -@@ -4578,6 +4605,8 @@ +@@ -4587,6 +4614,8 @@ } static void write_slice_end(MpegEncContext *s){ @@ -255,7 +217,7 @@ if(s->codec_id==CODEC_ID_MPEG4){ if(s->partitioned_frame){ ff_mpeg4_merge_partitions(s); -@@ -4587,6 +4616,7 @@ +@@ -4596,6 +4625,7 @@ }else if(s->out_format == FMT_MJPEG){ ff_mjpeg_stuffing(&s->pb); } @@ -263,7 +225,7 @@ align_put_bits(&s->pb); flush_put_bits(&s->pb); -@@ -4640,10 +4670,13 @@ +@@ -4649,10 +4679,13 @@ case CODEC_ID_FLV1: s->gob_index = ff_h263_get_gob_height(s); break; @@ -277,7 +239,7 @@ } s->resync_mb_x=0; -@@ -4714,9 +4747,12 @@ +@@ -4725,9 +4758,12 @@ if(s->start_mb_y != mb_y || mb_x!=0){ write_slice_end(s); @@ -290,7 +252,7 @@ } assert((put_bits_count(&s->pb)&7) == 0); -@@ -4740,19 +4776,25 @@ +@@ -4751,19 +4787,25 @@ } switch(s->codec_id){ @@ -316,7 +278,7 @@ } if(s->flags&CODEC_FLAG_PASS1){ -@@ -4865,7 +4907,10 @@ +@@ -4876,7 +4918,10 @@ s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mb_intra= 0; @@ -327,7 +289,7 @@ encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, &dmin, &next_block, mx, my); } -@@ -5051,7 +5096,10 @@ +@@ -5062,7 +5107,10 @@ s->mb_intra= 0; motion_x=s->b_direct_mv_table[xy][0]; motion_y=s->b_direct_mv_table[xy][1]; @@ -339,20 +301,19 @@ break; case CANDIDATE_MB_TYPE_BIDIR: s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; -@@ -5158,9 +5206,12 @@ - } +@@ -5170,8 +5218,11 @@ } + //not beautiful here but we must write it before flushing so it has to be here +/* xine: do not need this for decode or MPEG-1 encoding modes */ +#if 0 - //not beautifull here but we must write it before flushing so it has to be here if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) msmpeg4_encode_ext_header(s); +#endif /* #if 0 */ write_slice_end(s); -@@ -5223,10 +5274,13 @@ +@@ -5234,10 +5285,13 @@ s->me.mb_var_sum_temp = s->me.mc_mb_var_sum_temp = 0; @@ -366,7 +327,7 @@ s->me.scene_change_score=0; -@@ -5245,6 +5299,8 @@ +@@ -5256,6 +5310,8 @@ ff_update_duplicate_context(s->thread_context[i], s); } @@ -375,7 +336,7 @@ ff_init_me(s); /* Estimate motion for every MB */ -@@ -5259,6 +5315,8 @@ +@@ -5270,6 +5326,8 @@ s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); }else /* if(s->pict_type == I_TYPE) */{ @@ -384,7 +345,7 @@ /* I-Frame */ for(i=0; i<s->mb_stride*s->mb_height; i++) s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; -@@ -5282,6 +5340,8 @@ +@@ -5293,6 +5351,8 @@ //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); } @@ -393,7 +354,7 @@ if(!s->umvplus){ if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); -@@ -5335,11 +5395,14 @@ +@@ -5346,11 +5406,14 @@ } } } @@ -408,7 +369,7 @@ switch(s->codec_id){ case CODEC_ID_MPEG4: ff_clean_mpeg4_qscales(s); -@@ -5350,6 +5413,7 @@ +@@ -5361,6 +5424,7 @@ ff_clean_h263_qscales(s); break; } @@ -416,7 +377,7 @@ s->lambda= s->lambda_table[0]; //FIXME broken -@@ -5385,6 +5449,8 @@ +@@ -5396,6 +5460,8 @@ s->last_bits= put_bits_count(&s->pb); switch(s->out_format) { @@ -425,7 +386,7 @@ case FMT_MJPEG: mjpeg_picture_header(s); break; -@@ -5407,11 +5473,15 @@ +@@ -5424,11 +5490,15 @@ else h263_encode_picture_header(s, picture_number); break; @@ -441,11 +402,11 @@ default: assert(0); } ---- /home/melanson/projects/ffmpeg/libavcodec/msmpeg4.c 2005-04-18 12:07:13.000000000 -0600 -+++ libavcodec/msmpeg4.c 2005-04-18 22:57:31.510688000 -0600 -@@ -178,8 +178,11 @@ - s->c_dc_scale_table= wmv1_c_dc_scale_table; +--- /home/melanson/temp/ffmpeg/libavcodec/msmpeg4.c 2005-05-05 20:53:15.794521736 -0600 ++++ libavcodec/msmpeg4.c 2005-05-05 21:30:43.786774968 -0600 +@@ -179,8 +179,11 @@ break; + #if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC9_DECODER) case 6: +/* xine: comment this out as WMV3 support is incomplete */ +#if 0 @@ -453,5 +414,4 @@ s->c_dc_scale_table= wmv3_dc_scale_table; +#endif /* #if 0 */ break; - - } + #endif |