On 2013-02-13 16:26:43 +0100, Anton Khirnov wrote: > > On Wed, 13 Feb 2013 15:19:57 +0100, Janne Grunau <[email protected]> > wrote: > > On 2013-02-13 14:01:07 +0100, Anton Khirnov wrote: > > > diff --git a/libavcodec/h264.h b/libavcodec/h264.h > > > index c4addbe..6d57723 100644 > > > --- a/libavcodec/h264.h > > > +++ b/libavcodec/h264.h > > > @@ -30,6 +30,7 @@ > > > > > > #include "libavutil/intreadwrite.h" > > > #include "cabac.h" > > > +#include "get_bits.h" > > > #include "mpegvideo.h" > > > #include "h264chroma.h" > > > #include "h264dsp.h" > > > @@ -60,7 +61,7 @@ > > > #define MB_MBAFF h->mb_mbaff > > > #define MB_FIELD h->mb_field_decoding_flag > > > #define FRAME_MBAFF h->mb_aff_frame > > > -#define FIELD_PICTURE (s->picture_structure != PICT_FRAME) > > > +#define FIELD_PICTURE (h->picture_structure != PICT_FRAME) > > > #define LEFT_MBS 2 > > > #define LTOP 0 > > > #define LBOT 1 > > > @@ -250,15 +251,42 @@ typedef struct MMCO { > > > * H264Context > > > */ > > > typedef struct H264Context { > > > - MpegEncContext s; > > > + AVCodecContext *avctx; > > > + DSPContext dsp; > > > + VideoDSPContext vdsp; > > > H264DSPContext h264dsp; > > > H264ChromaContext h264chroma; > > > H264QpelContext h264qpel; > > > + MotionEstContext me; > > > + ParseContext parse_context; > > > + GetBitContext gb; > > > + ERContext er; > > > + > > > + Picture *DPB; > > > + Picture *cur_pic_ptr; > > > + Picture cur_pic; > > > + int picture_count; > > > + int picture_range_start, picture_range_end; > > > + > > > int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264 > > > int chroma_qp[2]; // QPc > > > > > > int qp_thresh; ///< QP threshold to skip loopfilter > > > > > > + int width, height; > > > + int linesize, uvlinesize; > > > + int chroma_x_shift, chroma_y_shift; > > > + > > > + int qscale; > > > + int droppable; > > > + int data_partitioning; > > > + int coded_picture_number; > > > + int low_delay; > > > + > > > + int context_initialized; > > > + int flags; > > > > is there a good reason why we copy flags from the avctx? > > > > Better cache usage? Don't know really.
I guess ok for now. Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
