Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

Untitled diff

Créé il y a 10 ansLe diff n'expire jamais

10 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

53 lignes

5 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

54 lignes

/* •¶ŽšƒR[ƒh‚Í‚r‚i‚h‚r ‰üsƒR[ƒh‚Í‚b‚q‚k‚e */

/* $Id: Codec.h 731 2011-08-30 13:49:13Z umezawa $ */

/* $Id$ */

#pragma once

#define CBGROSSWIDTH_NATURAL ((size_t)0)

#define CBGROSSWIDTH_WINDOWS ((size_t)-1)

class CCodec

{

public:

DLLEXPORT static CCodec *CreateInstance(utvf_t utvf, const char *pszInterfaceName);

DLLEXPORT static void DeleteInstance(CCodec *pCodec);

protected:

CCodec(void);

virtual ~CCodec(void);

public:

virtual const char *GetTinyName(void) = 0;

virtual void GetShortFriendlyName(char *pszName, size_t cchName) = 0;

virtual void GetShortFriendlyName(wchar_t *pszName, size_t cchName) = 0;

virtual void GetLongFriendlyName(char *pszName, size_t cchName) = 0;

virtual void GetLongFriendlyName(wchar_t *pszName, size_t cchName) = 0;

virtual const utvf_t *GetEncoderInputFormat(void) = 0;

virtual const utvf_t *GetDecoderOutputFormat(void) = 0;

virtual const utvf_t *GetCompressedFormat(void) = 0;

virtual bool IsTemporalCompressionSupported(void) = 0;

#ifdef _WIN32

virtual INT_PTR About(HWND hwnd);

virtual INT_PTR Configure(HWND hwnd) = 0;

#endif

virtual size_t GetStateSize(void) = 0;

virtual int GetState(void *pState, size_t cb) = 0;

virtual int SetState(const void *pState, size_t cb) = 0;

virtual int EncodeBegin(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual int EncodeBegin(unsigned int width, unsigned int height) = 0;

virtual size_t EncodeFrame(void *pOutput, bool *pbKeyFrame, const void *pInput) = 0;

virtual size_t EncodeFrame(void *pOutput, bool *pbKeyFrame, const void *pInput, utvf_t infmt, size_t cbGrossWidth) = 0;

virtual int EncodeEnd(void) = 0;

virtual size_t EncodeGetExtraDataSize(void) = 0;

virtual int EncodeGetExtraData(void *pExtraData, size_t cb, utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual int EncodeGetExtraData(void *pExtraData, size_t cb, unsigned int width, unsigned int height) = 0;

virtual size_t EncodeGetOutputSize(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual size_t EncodeGetOutputSize(utvf_t infmt, unsigned int width, unsigned int height) = 0;

virtual int EncodeQuery(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual int EncodeQuery(utvf_t infmt, unsigned int width, unsigned int height) = 0;

virtual int DecodeBegin(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth, const void *pExtraData, size_t cbExtraData) = 0;

virtual int DecodeBegin(unsigned int width, unsigned int height, const void *pExtraData, size_t cbExtraData) = 0;

virtual size_t DecodeFrame(void *pOutput, const void *pInput, bool bKeyFrame) = 0;

virtual size_t DecodeFrame(void *pOutput, const void *pInput, utvf_t outfmt, size_t cbGrossWidth) = 0;

virtual int DecodeGetFrameType(bool *pbKeyFrame, const void *pInput) = 0;

virtual int DecodeEnd(void) = 0;

virtual size_t DecodeGetOutputSize(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual int DecodeQuery(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth, const void *pExtraData, size_t cbExtraData) = 0;

virtual int DecodeQuery(utvf_t outfmt, unsigned int width, unsigned int height, const void *pExtraData, size_t cbExtraData) = 0;

};

Différences enregistrées

Texte d'origine

Ouvrir un fichier

/* •¶ŽšƒR[ƒh‚Í‚r‚i‚h‚r ‰üsƒR[ƒh‚Í‚b‚q‚k‚e */
/* $Id: Codec.h 731 2011-08-30 13:49:13Z umezawa $ */

#pragma once

#define CBGROSSWIDTH_NATURAL ((size_t)0)
#define CBGROSSWIDTH_WINDOWS ((size_t)-1)

class CCodec
{
public:
	DLLEXPORT static CCodec *CreateInstance(utvf_t utvf, const char *pszInterfaceName);
	DLLEXPORT static void DeleteInstance(CCodec *pCodec);

protected:
	CCodec(void);
	virtual ~CCodec(void);

public:
	virtual const char *GetTinyName(void) = 0;
	virtual void GetShortFriendlyName(char *pszName, size_t cchName) = 0;
	virtual void GetShortFriendlyName(wchar_t *pszName, size_t cchName) = 0;
	virtual void GetLongFriendlyName(char *pszName, size_t cchName) = 0;
	virtual void GetLongFriendlyName(wchar_t *pszName, size_t cchName) = 0;
	virtual const utvf_t *GetEncoderInputFormat(void) = 0;
	virtual const utvf_t *GetDecoderOutputFormat(void) = 0;
	virtual const utvf_t *GetCompressedFormat(void) = 0;
	virtual bool IsTemporalCompressionSupported(void) = 0;

#ifdef _WIN32
	virtual INT_PTR About(HWND hwnd);
	virtual INT_PTR Configure(HWND hwnd) = 0;
#endif

virtual size_t GetStateSize(void) = 0;
	virtual int GetState(void *pState, size_t cb) = 0;
	virtual int SetState(const void *pState, size_t cb) = 0;

virtual int EncodeBegin(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;
	virtual size_t EncodeFrame(void *pOutput, bool *pbKeyFrame, const void *pInput) = 0;
	virtual int EncodeEnd(void) = 0;
	virtual size_t EncodeGetExtraDataSize(void) = 0;
	virtual int EncodeGetExtraData(void *pExtraData, size_t cb, utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;
	virtual size_t EncodeGetOutputSize(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;
	virtual int EncodeQuery(utvf_t infmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;

virtual int DecodeBegin(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth, const void *pExtraData, size_t cbExtraData) = 0;
	virtual size_t DecodeFrame(void *pOutput, const void *pInput, bool bKeyFrame) = 0;
	virtual int DecodeEnd(void) = 0;
	virtual size_t DecodeGetOutputSize(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;
	virtual int DecodeQuery(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth, const void *pExtraData, size_t cbExtraData) = 0;
};

Texte modifié

Ouvrir un fichier

/* •¶ŽšƒR[ƒh‚Í‚r‚i‚h‚r ‰üsƒR[ƒh‚Í‚b‚q‚k‚e */
/* $Id$ */

#pragma once

#define CBGROSSWIDTH_NATURAL ((size_t)0)
#define CBGROSSWIDTH_WINDOWS ((size_t)-1)

class CCodec
{
public:
	DLLEXPORT static CCodec *CreateInstance(utvf_t utvf, const char *pszInterfaceName);
	DLLEXPORT static void DeleteInstance(CCodec *pCodec);

protected:
	CCodec(void);
	virtual ~CCodec(void);

#ifdef _WIN32
	virtual INT_PTR About(HWND hwnd);
	virtual INT_PTR Configure(HWND hwnd) = 0;
#endif

virtual size_t GetStateSize(void) = 0;
	virtual int GetState(void *pState, size_t cb) = 0;
	virtual int SetState(const void *pState, size_t cb) = 0;

virtual int EncodeBegin(unsigned int width, unsigned int height) = 0;
	virtual size_t EncodeFrame(void *pOutput, bool *pbKeyFrame, const void *pInput, utvf_t infmt, size_t cbGrossWidth) = 0;
	virtual int EncodeEnd(void) = 0;
	virtual size_t EncodeGetExtraDataSize(void) = 0;
	virtual int EncodeGetExtraData(void *pExtraData, size_t cb, unsigned int width, unsigned int height) = 0;
	virtual size_t EncodeGetOutputSize(utvf_t infmt, unsigned int width, unsigned int height) = 0;
	virtual int EncodeQuery(utvf_t infmt, unsigned int width, unsigned int height) = 0;

virtual int DecodeBegin(unsigned int width, unsigned int height, const void *pExtraData, size_t cbExtraData) = 0;
	virtual size_t DecodeFrame(void *pOutput, const void *pInput, utvf_t outfmt, size_t cbGrossWidth) = 0;
	virtual int DecodeGetFrameType(bool *pbKeyFrame, const void *pInput) = 0;
	virtual int DecodeEnd(void) = 0;
	virtual size_t DecodeGetOutputSize(utvf_t outfmt, unsigned int width, unsigned int height, size_t cbGrossWidth) = 0;
	virtual int DecodeQuery(utvf_t outfmt, unsigned int width, unsigned int height, const void *pExtraData, size_t cbExtraData) = 0;
};