Revision 029911d1 libavcodec/mpegvideo.h

View differences:

libavcodec/mpegvideo.h
48 48

  
49 49
#define MAX_PICTURE_COUNT 15
50 50

  
51
#if 1
52
#define ME_MAP_SIZE 4096
53
#define ME_MAP_SHIFT 6
54
#else
51 55
#define ME_MAP_SIZE 64
52 56
#define ME_MAP_SHIFT 3
57
#endif
53 58
#define ME_MAP_MV_BITS 11
54 59

  
55 60
/* run length table */
......
385 390
    int me_method;                       ///< ME algorithm 
386 391
    int scene_change_score;
387 392
    int mv_dir;
388
#define MV_DIR_BACKWARD  1
389
#define MV_DIR_FORWARD   2
393
#define MV_DIR_L1        1
394
#define MV_DIR_L0        2
395
#define MV_DIR_BACKWARD  MV_DIR_L1
396
#define MV_DIR_FORWARD   MV_DIR_L0
390 397
#define MV_DIRECT        4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4)
391 398
    int mv_type;
392 399
#define MV_TYPE_16X16       0   ///< 1 vector for the whole mb 
......
568 575
    uint8_t *tex_pb_buffer;          
569 576
    uint8_t *pb2_buffer;
570 577
    int mpeg_quant;
578
#define FF_QUANT_DEFAULT 0
579
#define FF_QUANT_MPEG2   1
580
#define FF_QUANT_MPEG1   2
581
#define FF_QUANT_H263    3
582

  
571 583
    int16_t (*field_mv_table)[2][2];   ///< used for interlaced b frame decoding 
572 584
    int8_t (*field_select_table)[2];   ///< wtf, no really another table for interlaced b frames 
573 585
    int t_frame;                       ///< time distance of first I -> B, used for interlaced b frames 
......
644 656
    int repeat_first_field;
645 657
    int chroma_420_type;
646 658
    int progressive_frame;
647
    int mpeg2;
648 659
    int full_pel[2];
649 660
    int interlaced_dct;
650 661
    int first_slice;
......
652 663
    
653 664
    /* RTP specific */
654 665
    /* These are explained on avcodec.h */
655
    int rtp_mode;
666
    int rtp_mode; //FIXME simplify this mess (remove callback, merge mode + payload)
656 667
    int rtp_payload_size;
657 668
    void (*rtp_callback)(void *data, int size, int packet_number);
658 669
    uint8_t *ptr_lastgob;
......
870 881
int ff_msmpeg4_decode_init(MpegEncContext *s);
871 882
void ff_msmpeg4_encode_init(MpegEncContext *s);
872 883
int ff_wmv2_decode_picture_header(MpegEncContext * s);
884
int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
873 885
void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
874 886
void ff_mspel_motion(MpegEncContext *s,
875 887
                               uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,

Also available in: Unified diff