libavcodec.hg: mpegvideo.h comparison

comparison mpegvideo.h @ 745:25d7fb7c89be libavcodec

better/cleaner error resilience (done in a 2nd pass after decoding) h263/mpeg4 out of order slice decoding

author	michaelni
date	Sun, 13 Oct 2002 13:16:04 +0000
parents	a91203b34e71
children	3d4377531f6c

comparison

equal deleted inserted replaced

-:2f7da29ede37
+:25d7fb7c89be
 int skip_count;
 int misc_bits; // cbp, mb_type
 int last_bits; //temp var used for calculating the above vars
 /* error concealment / resync */
+UINT8 *error_status_table;       /* table of the error status of each MB */
+#define VP_START            1        /* current MB is the first after a resync marker */
+#define AC_ERROR            2
+#define DC_ERROR            4
+#define MV_ERROR            8
+#define AC_END              16
+#define DC_END              32
+#define MV_END              64
+//FIXME some prefix?
 int resync_mb_x;                 /* x position of last resync marker */
 int resync_mb_y;                 /* y position of last resync marker */
-int mb_num_left;                 /* number of MBs left in this video packet */
+GetBitContext last_resync_gb;    /* used to serach for the next resync marker */
-GetBitContext next_resync_gb;    /* starts at the next resync marker */
+int mb_num_left;                 /* number of MBs left in this video packet (for partitioned Slices only)*/
-int next_resync_qscale;          /* qscale of next resync marker */
-int next_resync_pos;             /* bitstream position of next resync marker */
-#define DECODING_AC_LOST -1
-#define DECODING_ACDC_LOST -2
-#define DECODING_DESYNC -3
-int decoding_error;
 int next_p_frame_damaged;        /* set if the next p frame is damaged, to avoid showing trashed b frames */
 int error_resilience;
 /* H.263 specific */
 int gob_number;
 int aspect_ratio_info;
 int aspected_width;
 int aspected_height;
 int sprite_warping_accuracy;
 int low_latency_sprite;
-int data_partitioning;
+int data_partitioning;           /* data partitioning flag from header */
+int partitioned_frame;           /* is current frame partitioned */
 int rvlc;                        /* reversible vlc */
 int resync_marker;               /* could this stream contain resync markers*/
 int low_delay;                   /* no reordering needed / has no b-frames */
 int vo_type;
 int vol_control_parameters;      /* does the stream contain the low_delay flag, used to workaround buggy encoders */
 int divx_build;
 #define BITSTREAM_BUFFER_SIZE 1024*256
 UINT8 *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
 int bitstream_buffer_size;
+/* lavc specific stuff, used to workaround bugs in libavcodec */
+int ffmpeg_version;
+int lavc_build;
 /* RV10 specific */
 int rv10_version; /* RV10 version: 0 or 3 */
 int rv10_first_dc_coded[3];
 /* MJPEG specific */
 UINT8 *ptr_last_mb_line;
 UINT32 mb_line_avgsize;
 DCTELEM (*block)[64]; /* points to one of the following blocks */
 DCTELEM blocks[2][6][64] __align8; // for HQ mode we need to keep the best block
+int (*decode_mb)(struct MpegEncContext *s, DCTELEM block[6][64]); // used by some codecs to avoid a switch()
+#define SLICE_OK         0
+#define SLICE_ERROR     -1
+#define SLICE_END       -2 //end marker found
+#define SLICE_NOEND     -3 //no end marker or error found but mb count exceeded
 void (*dct_unquantize_mpeg1)(struct MpegEncContext *s,
 DCTELEM *block, int n, int qscale);
 void (*dct_unquantize_mpeg2)(struct MpegEncContext *s,
 DCTELEM *block, int n, int qscale);
 void (*dct_unquantize_h263)(struct MpegEncContext *s,
 int (*dct_quantize)(struct MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
 void (*fdct)(DCTELEM *block/* align 16*/);
 void (*idct_put)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
 void (*idct_add)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
 } MpegEncContext;
 int DCT_common_init(MpegEncContext *s);
 int MPV_common_init(MpegEncContext *s);
 void MPV_common_end(MpegEncContext *s);
 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
 extern void (*draw_edges)(UINT8 *buf, int wrap, int width, int height, int w);
 void ff_conceal_past_errors(MpegEncContext *s, int conceal_all);
 void ff_copy_bits(PutBitContext *pb, UINT8 *src, int length);
 void ff_clean_intra_table_entries(MpegEncContext *s);
 void ff_init_scantable(MpegEncContext *s, ScanTable *st, const UINT8 *src_scantable);
+void ff_error_resilience(MpegEncContext *s);
+void ff_draw_horiz_band(MpegEncContext *s);
 extern int ff_bit_exact;
+static inline void ff_init_block_index(MpegEncContext *s){
+s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1 + s->mb_x*2;
+s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1)     + s->mb_x*2;
+s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1 + s->mb_x*2;
+s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2)     + s->mb_x*2;
+s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1)                    + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
+s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
+}
+static inline void ff_update_block_index(MpegEncContext *s){
+s->block_index[0]+=2;
+s->block_index[1]+=2;
+s->block_index[2]+=2;
+s->block_index[3]+=2;
+s->block_index[4]++;
+s->block_index[5]++;
+}
 /* motion_est.c */
 void ff_estimate_p_frame_motion(MpegEncContext * s,
 int mb_x, int mb_y);
 void ff_estimate_b_frame_motion(MpegEncContext * s,
 int mb_x, int mb_y);
 int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type);
 void ff_fix_long_p_mvs(MpegEncContext * s);
 void ff_fix_long_b_mvs(MpegEncContext * s, int16_t (*mv_table)[2], int f_code, int type);
 /* mpeg12.c */
 extern const INT16 ff_mpeg1_default_intra_matrix[64];
 extern const INT16 ff_mpeg1_default_non_intra_matrix[64];
 extern UINT8 ff_mpeg1_dc_scale_table[128];
 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
 void mpeg1_encode_mb(MpegEncContext *s,
 DCTELEM block[6][64],
 int motion_x, int motion_y);
 void ff_mpeg1_encode_init(MpegEncContext *s);
 /* h263enc.c */
 typedef struct RLTable {
 int n; /* number of entries of table_vlc minus 1 */
 int last; /* number of values for last = 0 */
 extern UINT8 ff_mpeg4_y_dc_scale_table[32];
 extern UINT8 ff_mpeg4_c_dc_scale_table[32];
 extern const INT16 ff_mpeg4_default_intra_matrix[64];
 extern const INT16 ff_mpeg4_default_non_intra_matrix[64];
 void h263_encode_mb(MpegEncContext *s,
 DCTELEM block[6][64],
 int motion_x, int motion_y);
 void mpeg4_encode_mb(MpegEncContext *s,
 DCTELEM block[6][64],
 void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n,
 int dir);
 void ff_set_mpeg4_time(MpegEncContext * s, int picture_number);
 void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
 void h263_encode_init(MpegEncContext *s);
 void h263_decode_init_vlc(MpegEncContext *s);
 int h263_decode_picture_header(MpegEncContext *s);
-int h263_decode_gob_header(MpegEncContext *s);
+int ff_h263_decode_gob_header(MpegEncContext *s);
 int mpeg4_decode_picture_header(MpegEncContext * s);
 int intel_h263_decode_picture_header(MpegEncContext *s);
-int h263_decode_mb(MpegEncContext *s,
+int ff_h263_decode_mb(MpegEncContext *s,
 DCTELEM block[6][64]);
 int h263_get_picture_format(int width, int height);
-int ff_mpeg4_decode_video_packet_header(MpegEncContext *s);
-int ff_mpeg4_resync(MpegEncContext *s);
 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s);
 void ff_mpeg4_clean_buffers(MpegEncContext *s);
 void ff_mpeg4_stuffing(PutBitContext * pbc);
 void ff_mpeg4_init_partitions(MpegEncContext *s);
 void ff_mpeg4_merge_partitions(MpegEncContext *s);
-extern inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr);
 void ff_clean_mpeg4_qscales(MpegEncContext *s);
 void ff_clean_h263_qscales(MpegEncContext *s);
+int ff_mpeg4_decode_partitions(MpegEncContext *s);
+int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s);
+int ff_h263_resync(MpegEncContext *s);
+int ff_h263_get_gob_height(MpegEncContext *s);
 /* rv10.c */
 void rv10_encode_picture_header(MpegEncContext *s, int picture_number);
 int rv_decode_dc(MpegEncContext *s, int n);
 /* msmpeg4.c */
 void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
 void msmpeg4_encode_ext_header(MpegEncContext * s);
 void msmpeg4_encode_mb(MpegEncContext * s,
 DCTELEM block[6][64],
 int motion_x, int motion_y);
 int msmpeg4_decode_picture_header(MpegEncContext * s);
 int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
-int msmpeg4_decode_mb(MpegEncContext *s,
-DCTELEM block[6][64]);
 int ff_msmpeg4_decode_init(MpegEncContext *s);
 void ff_msmpeg4_encode_init(MpegEncContext *s);
 /* mjpegenc.c */
 int mjpeg_init(MpegEncContext *s);
 void mjpeg_close(MpegEncContext *s);
 void mjpeg_encode_mb(MpegEncContext *s,
 DCTELEM block[6][64]);
 void mjpeg_picture_header(MpegEncContext *s);
 void mjpeg_picture_trailer(MpegEncContext *s);
 /* rate control */
 int ff_rate_control_init(MpegEncContext *s);
 float ff_rate_estimate_qscale(MpegEncContext *s);
 void ff_write_pass1_stats(MpegEncContext *s);

Mercurial > libavcodec.hg

comparison mpegvideo.h @ 745:25d7fb7c89be libavcodec