Attachment #82697 for bug #126287

View | Details | Raw Unified | Return to bug 126287
Collapse All | Expand All

Lines 12-18 Link Here

(-)avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h.orig (-1 / +1 lines)
12	class AccelRender	12	class AccelRender
13	{	13	{
14	public:	14	public:
15	AccelRender::AccelRender( void);	15	AccelRender( void);
16	virtual uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;	16	virtual uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;
17	virtual uint8_t end(void)=0;	17	virtual uint8_t end(void)=0;
18	virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;	18	virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;

Lines 38-46 Link Here

(-)avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h.orig (-3 / +3 lines)
38		38
39	uint32_t _type;	39	uint32_t _type;
40		40
41	uint32_t picHeader::read32(FILE *fd);	41	uint32_t read32(FILE *fd);
42	uint16_t picHeader::read16(FILE *fd);	42	uint16_t read16(FILE *fd);
43	uint8_t picHeader::read8(FILE *fd);	43	uint8_t read8(FILE *fd);
44		44
45	public:	45	public:
46	// static int checkFourCC(uint8_t in, uint8_t fourcc);	46	// static int checkFourCC(uint8_t in, uint8_t fourcc);

Lines 55-62 Link Here

(-)avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp.orig (-2 / +2 lines)
55	void update(void);	55	void update(void);
56	public:	56	public:
57		57
58	DGbob::DGbob(AVDMGenericVideoStream in,CONFcouple couples);	58	DGbob(AVDMGenericVideoStream in,CONFcouple couples);
59	DGbob::~DGbob(void);	59	~DGbob(void);
60	uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,	60	uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
61	ADMImage data,uint32_t flags);	61	ADMImage data,uint32_t flags);
62		62

Lines 147-154 Link Here

(-)avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp.orig (-2 / +2 lines)
147		147
148	public:	148	public:
149		149
150	Decimate::Decimate(AVDMGenericVideoStream in,CONFcouple couples);	150	Decimate(AVDMGenericVideoStream in,CONFcouple couples);
151	Decimate::~Decimate(void);	151	~Decimate(void);
152	uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,	152	uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
153	ADMImage data,uint32_t flags);	153	ADMImage data,uint32_t flags);
154		154





public:
	
	void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, 
				unsigned char *prp, unsigned char *prpU, unsigned char *prpV);
	void Show(ADMImage *dst, int frame);
	void Debug(int frame);

	Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);		
			
	~Telecide();

	void PutChosen(int frame, unsigned int chosen);
	

	void CacheInsert(int frame, unsigned int p, unsigned int pblock,
				unsigned int c, unsigned int cblock);
	
	bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
				unsigned int *c, unsigned int *cblock);	

	bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
	
	struct PREDICTION *PredictSoftYUY2(int frame);

	void WriteHints(unsigned char *dst, bool film, bool inpattern);
	virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
				ADMImage *data,uint32_t *flags);
	char *printConf( void );
	uint8_t configure(AVDMGenericVideoStream *in);
	uint8_t	getCoupledConf( CONFcouple **couples);
};

Return to bug 126287

Lines 112-143 Link Here

(-)avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h.orig (-15 / +15 lines)
112		112
113	public:	113	public:
114		114
115	void Telecide::CalculateMetrics(int n, unsigned char crp, unsigned char crpU, unsigned char *crpV,	115	void CalculateMetrics(int n, unsigned char crp, unsigned char crpU, unsigned char *crpV,
116	unsigned char prp, unsigned char prpU, unsigned char *prpV);	116	unsigned char prp, unsigned char prpU, unsigned char *prpV);
117	void Telecide::Show(ADMImage *dst, int frame);	117	void Show(ADMImage *dst, int frame);
118	void Telecide::Debug(int frame);	118	void Debug(int frame);
119		119
120	Telecide::Telecide(AVDMGenericVideoStream in,CONFcouple couples);	120	Telecide(AVDMGenericVideoStream in,CONFcouple couples);
121		121
122	Telecide::~Telecide();	122	~Telecide();
123		123
124	void Telecide::PutChosen(int frame, unsigned int chosen);	124	void PutChosen(int frame, unsigned int chosen);
125		125
126		126
127	void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock,	127	void CacheInsert(int frame, unsigned int p, unsigned int pblock,
128	unsigned int c, unsigned int cblock);	128	unsigned int c, unsigned int cblock);
129		129
130	bool Telecide::CacheQuery(int frame, unsigned int p, unsigned int pblock,	130	bool CacheQuery(int frame, unsigned int p, unsigned int pblock,
131	unsigned int c, unsigned int cblock);	131	unsigned int c, unsigned int cblock);
132		132
133	bool Telecide::PredictHardYUY2(int frame, unsigned int predicted, unsigned int predicted_metric) ;	133	bool PredictHardYUY2(int frame, unsigned int predicted, unsigned int predicted_metric) ;
134		134
135	struct PREDICTION *Telecide::PredictSoftYUY2(int frame);	135	struct PREDICTION *PredictSoftYUY2(int frame);
136		136
137	void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern);	137	void WriteHints(unsigned char *dst, bool film, bool inpattern);
138	virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,	138	virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
139	ADMImage data,uint32_t flags);	139	ADMImage data,uint32_t flags);
140	char *Telecide::printConf( void );	140	char *printConf( void );
141	uint8_t Telecide::configure(AVDMGenericVideoStream *in);	141	uint8_t configure(AVDMGenericVideoStream *in);
142	uint8_t Telecide::getCoupledConf( CONFcouple **couples);	142	uint8_t getCoupledConf( CONFcouple **couples);
143	};	143	};