Attachment #90127 for bug #137958

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

Lines 12-18 Link Here

(-)a/avidemux/ADM_gui2/GUI_accelRender.h (-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 44-52 Link Here

(-)a/avidemux/ADM_inpics/ADM_pics.h (-3 / +3 lines)
44		44
45	uint32_t _type;	45	uint32_t _type;
46		46
47	uint32_t picHeader::read32(FILE *fd);	47	uint32_t read32(FILE *fd);
48	uint16_t picHeader::read16(FILE *fd);	48	uint16_t read16(FILE *fd);
49	uint8_t picHeader::read8(FILE *fd);	49	uint8_t read8(FILE *fd);
50		50
51	public:	51	public:
52	// static int checkFourCC(uint8_t in, uint8_t fourcc);	52	// static int checkFourCC(uint8_t in, uint8_t fourcc);

Lines 95-101 Link Here

(-)a/avidemux/ADM_mpegdemuxer/dmx_demuxerPS.h (-2 / +2 lines)
95	read(&r,1);	95	read(&r,1);
96	return r;	96	return r;
97	}	97	}
98	uint16_t dmx_demuxerPS::read16i(void)	98	uint16_t read16i(void)
99	{	99	{
100	uint16_t r;	100	uint16_t r;
101	uint8_t p[2];	101	uint8_t p[2];
Lines 112-118 Link Here
112	r=(p[0]<<8)+p[1];	112	r=(p[0]<<8)+p[1];
113	return r;	113	return r;
114	}	114	}
115	uint32_t dmx_demuxerPS::read32i(void)	115	uint32_t read32i(void)
116	{	116	{
117	uint32_t r;	117	uint32_t r;
118	uint8_t *p;	118	uint8_t *p;

Lines 108-114 Link Here

(-)a/avidemux/ADM_mpegdemuxer/dmx_demuxerTS.h (-2 / +2 lines)
108	read(&r,1);	108	read(&r,1);
109	return r;	109	return r;
110	}	110	}
111	uint16_t dmx_demuxerTS::read16i(void)	111	uint16_t read16i(void)
112	{	112	{
113	uint16_t r;	113	uint16_t r;
114	uint8_t p[2];	114	uint8_t p[2];
Lines 125-131 Link Here
125	r=(p[0]<<8)+p[1];	125	r=(p[0]<<8)+p[1];
126	return r;	126	return r;
127	}	127	}
128	uint32_t dmx_demuxerTS::read32i(void)	128	uint32_t read32i(void)
129	{	129	{
130	uint32_t r;	130	uint32_t r;
131	uint8_t *p;	131	uint8_t *p;




                        

#else
uint32_t read32i(void )
{
       uint32_t v;
       uint8_t c[4];

       v= (p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3];
       return v;
}
uint16_t read16i(void )
{
  uint32_t v;
       uint8_t c[4];

       v= (p[0]<<8)+p[1];
       return v;
}
uint8_t read8i(void )
{
uint8_t r;
        if(_off<_tail)

Lines 147-154 Link Here

(-)a/avidemux/ADM_video/ADM_vidDecDec.cpp (-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);
};

Lines 55-62 Link Here

(-)a/avidemux/ADM_video/ADM_vidDGbob.cpp (-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

Return to bug 137958

Lines 64-70 Link Here

(-)a/avidemux/ADM_mpegdemuxer/dmx_io.h (-3 / +3 lines)
64		64
65		65
66	#else	66	#else
67	uint32_t fileParser::read32i(void )	67	uint32_t read32i(void )
68	{	68	{
69	uint32_t v;	69	uint32_t v;
70	uint8_t c[4];	70	uint8_t c[4];
Lines 84-90 Link Here
84	v= (p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3];	84	v= (p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3];
85	return v;	85	return v;
86	}	86	}
87	uint16_t fileParser::read16i(void )	87	uint16_t read16i(void )
88	{	88	{
89	uint32_t v;	89	uint32_t v;
90	uint8_t c[4];	90	uint8_t c[4];
Lines 104-110 Link Here
104	v= (p[0]<<8)+p[1];	104	v= (p[0]<<8)+p[1];
105	return v;	105	return v;
106	}	106	}
107	uint8_t fileParser::read8i(void )	107	uint8_t read8i(void )
108	{	108	{
109	uint8_t r;	109	uint8_t r;
110	if(_off<_tail)	110	if(_off<_tail)

Lines 112-143 Link Here

(-)a/avidemux/ADM_video/ADM_vidDecTelecide.h (-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	};