diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/apps/mplayerc/Changelog.txt | 2 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffImgfmt.cpp | 1785 | ||||
| -rw-r--r-- | src/thirdparty/MediaInfo/MediaInfoLib.vcproj | 16 | ||||
| -rw-r--r-- | src/thirdparty/MediaInfo/MediaInfoLib.vcxproj | 10 | ||||
| -rw-r--r-- | src/thirdparty/MediaInfo/MediaInfoLib.vcxproj.filters | 6 |
5 files changed, 896 insertions, 923 deletions
diff --git a/src/apps/mplayerc/Changelog.txt b/src/apps/mplayerc/Changelog.txt index fd28daf5a..3e0753890 100644 --- a/src/apps/mplayerc/Changelog.txt +++ b/src/apps/mplayerc/Changelog.txt @@ -14,7 +14,7 @@ v1.5.xxxx.0 - unreleased NEW : Added ignore encrypted channels checkbox during DVB scan
NEW : Armenian translation
CHANGED: Updated FFmpeg
- CHANGED: Updated MediaInfoLib to v0.7.38
+ CHANGED: Updated MediaInfoLib to v0.7.38+
CHANGED: Updated ZenLib to v0.4.17
CHANGED: Updated Little CMS to v2.1
CHANGED: Updated libpng to v1.4.5
diff --git a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp index 026a08fc9..b6b217898 100644 --- a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp +++ b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp @@ -24,955 +24,912 @@ #include <moreuuids.h>
#include "char_t.h"
-const TcspInfo cspInfos[]=
-{
- {
- FF_CSP_420P,_l("YV12"),
- 1,12, //Bpp
- 3, //numplanes
- {0,1,1,0}, //shiftX
- {0,1,1,0}, //shiftY
- {0,128,128,0}, //black,
- FOURCC_YV12, FOURCC_YV12, &MEDIASUBTYPE_YV12
- },
- {
- FF_CSP_422P,_l("422P"),
- 1,18, //Bpp
- 3, //numplanes
- {0,1,1,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_422P, FOURCC_422P, &MEDIASUBTYPE_422P
- },
- {
- FF_CSP_444P,_l("444P"),
- 1,24, //Bpp
- 3, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_444P, FOURCC_444P, &MEDIASUBTYPE_444P
- },
- {
- FF_CSP_411P,_l("411P"),
- 1,17, //Bpp
- 3, //numplanes
- {0,2,2,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_411P, FOURCC_411P, &MEDIASUBTYPE_411P
- },
- {
- FF_CSP_410P,_l("410P"),
- 1,10, //Bpp
- 3, //numplanes
- {0,2,2,0}, //shiftX
- {0,2,2,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_410P, FOURCC_410P, &MEDIASUBTYPE_410P
- },
+const TcspInfo cspInfos[]= {
+ {
+ FF_CSP_420P,_l("YV12"),
+ 1,12, //Bpp
+ 3, //numplanes
+ {0,1,1,0}, //shiftX
+ {0,1,1,0}, //shiftY
+ {0,128,128,0}, //black,
+ FOURCC_YV12, FOURCC_YV12, &MEDIASUBTYPE_YV12
+ },
+ {
+ FF_CSP_422P,_l("422P"),
+ 1,18, //Bpp
+ 3, //numplanes
+ {0,1,1,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_422P, FOURCC_422P, &MEDIASUBTYPE_422P
+ },
+ {
+ FF_CSP_444P,_l("444P"),
+ 1,24, //Bpp
+ 3, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_444P, FOURCC_444P, &MEDIASUBTYPE_444P
+ },
+ {
+ FF_CSP_411P,_l("411P"),
+ 1,17, //Bpp
+ 3, //numplanes
+ {0,2,2,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_411P, FOURCC_411P, &MEDIASUBTYPE_411P
+ },
+ {
+ FF_CSP_410P,_l("410P"),
+ 1,10, //Bpp
+ 3, //numplanes
+ {0,2,2,0}, //shiftX
+ {0,2,2,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_410P, FOURCC_410P, &MEDIASUBTYPE_410P
+ },
- {
- FF_CSP_YUY2,_l("YUY2"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0x8000,0,0,0}, //black
- FOURCC_YUY2, FOURCC_YUY2, &MEDIASUBTYPE_YUY2,
- 0,1 //packedLumaOffset,packedChromaOffset
- },
- {
- FF_CSP_UYVY,_l("UYVY"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0x0080,0,0,0}, //black
- FOURCC_UYVY, FOURCC_UYVY, &MEDIASUBTYPE_UYVY,
- 1,0 //packedLumaOffset,packedChromaOffset
- },
- {
- FF_CSP_YVYU,_l("YVYU"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0x8000,0,0,0}, //black
- FOURCC_YVYU, FOURCC_YVYU, &MEDIASUBTYPE_YVYU,
- 0,1 //packedLumaOffset,packedChromaOffset
- },
- {
- FF_CSP_VYUY,_l("VYUY"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0x0080,0,0,0}, //black
- FOURCC_VYUY, FOURCC_VYUY, &MEDIASUBTYPE_VYUY,
- 1,0 //packedLumaOffset,packedChromaOffset
- },
+ {
+ FF_CSP_YUY2,_l("YUY2"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0x8000,0,0,0}, //black
+ FOURCC_YUY2, FOURCC_YUY2, &MEDIASUBTYPE_YUY2,
+ 0,1 //packedLumaOffset,packedChromaOffset
+ },
+ {
+ FF_CSP_UYVY,_l("UYVY"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0x0080,0,0,0}, //black
+ FOURCC_UYVY, FOURCC_UYVY, &MEDIASUBTYPE_UYVY,
+ 1,0 //packedLumaOffset,packedChromaOffset
+ },
+ {
+ FF_CSP_YVYU,_l("YVYU"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0x8000,0,0,0}, //black
+ FOURCC_YVYU, FOURCC_YVYU, &MEDIASUBTYPE_YVYU,
+ 0,1 //packedLumaOffset,packedChromaOffset
+ },
+ {
+ FF_CSP_VYUY,_l("VYUY"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0x0080,0,0,0}, //black
+ FOURCC_VYUY, FOURCC_VYUY, &MEDIASUBTYPE_VYUY,
+ 1,0 //packedLumaOffset,packedChromaOffset
+ },
- {
- FF_CSP_ABGR,_l("ABGR"),
- 4,32, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB32
- },
- {
- FF_CSP_RGBA,_l("RGBA"),
- 4,32, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB32
- },
- {
- FF_CSP_BGR32,_l("BGR32"),
- 4,32, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB32
- },
- {
- FF_CSP_BGR24,_l("BGR24"),
- 3,24, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB24
- },
- {
- FF_CSP_BGR15,_l("BGR15"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB555
- },
- {
- FF_CSP_BGR16,_l("BGR16"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB565
- },
- {
- FF_CSP_RGB32,_l("RGB32"),
- 4,32, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, FOURCC_RGB3, &MEDIASUBTYPE_RGB32
- },
- {
- FF_CSP_RGB24,_l("RGB24"),
- 3,24, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, FOURCC_RGB2, &MEDIASUBTYPE_RGB24
- },
- {
- FF_CSP_RGB15,_l("RGB15"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, FOURCC_RGB5, &MEDIASUBTYPE_RGB555
- },
- {
- FF_CSP_RGB16,_l("RGB16"),
- 2,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, FOURCC_RGB6, &MEDIASUBTYPE_RGB565
- },
+ {
+ FF_CSP_ABGR,_l("ABGR"),
+ 4,32, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB32
+ },
+ {
+ FF_CSP_RGBA,_l("RGBA"),
+ 4,32, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB32
+ },
+ {
+ FF_CSP_BGR32,_l("BGR32"),
+ 4,32, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB32
+ },
+ {
+ FF_CSP_BGR24,_l("BGR24"),
+ 3,24, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB24
+ },
+ {
+ FF_CSP_BGR15,_l("BGR15"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB555
+ },
+ {
+ FF_CSP_BGR16,_l("BGR16"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB565
+ },
+ {
+ FF_CSP_RGB32,_l("RGB32"),
+ 4,32, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, FOURCC_RGB3, &MEDIASUBTYPE_RGB32
+ },
+ {
+ FF_CSP_RGB24,_l("RGB24"),
+ 3,24, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, FOURCC_RGB2, &MEDIASUBTYPE_RGB24
+ },
+ {
+ FF_CSP_RGB15,_l("RGB15"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, FOURCC_RGB5, &MEDIASUBTYPE_RGB555
+ },
+ {
+ FF_CSP_RGB16,_l("RGB16"),
+ 2,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, FOURCC_RGB6, &MEDIASUBTYPE_RGB565
+ },
- {
- FF_CSP_PAL8,_l("pal8"),
- 1,8, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- BI_RGB, 0, &MEDIASUBTYPE_RGB8
- },
- {
- FF_CSP_CLJR,_l("cljr"),
- 1,16, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- FOURCC_CLJR, FOURCC_CLJR, &MEDIASUBTYPE_CLJR
- },
- {
- FF_CSP_Y800,_l("gray"),
- 1,8, //Bpp
- 1, //numplanes
- {0,0,0,0}, //shiftX
- {0,0,0,0}, //shiftY
- {0,0,0,0}, //black
- FOURCC_Y800, FOURCC_Y800, &MEDIASUBTYPE_Y800
- },
- {
- FF_CSP_NV12,_l("NV12"),
- 1,12, //Bpp
- 2, //numplanes
- {0,0,0,0}, //shiftX
- {0,1,1,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_NV12, FOURCC_NV12, &MEDIASUBTYPE_NV12
- },
- 0
+ {
+ FF_CSP_PAL8,_l("pal8"),
+ 1,8, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ BI_RGB, 0, &MEDIASUBTYPE_RGB8
+ },
+ {
+ FF_CSP_CLJR,_l("cljr"),
+ 1,16, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ FOURCC_CLJR, FOURCC_CLJR, &MEDIASUBTYPE_CLJR
+ },
+ {
+ FF_CSP_Y800,_l("gray"),
+ 1,8, //Bpp
+ 1, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,0,0,0}, //shiftY
+ {0,0,0,0}, //black
+ FOURCC_Y800, FOURCC_Y800, &MEDIASUBTYPE_Y800
+ },
+ {
+ FF_CSP_NV12,_l("NV12"),
+ 1,12, //Bpp
+ 2, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,1,1,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_NV12, FOURCC_NV12, &MEDIASUBTYPE_NV12
+ },
+ 0
};
-TcspInfo cspInfoIYUV=
-{
- FF_CSP_420P,_l("YV12"),
- 1,12, //Bpp
- 3, //numplanes
- {0,1,1,0}, //shiftX
- {0,1,1,0}, //shiftY
- {0,128,128,0}, //black,
- FOURCC_IYUV, FOURCC_IYUV, &MEDIASUBTYPE_IYUV
+TcspInfo cspInfoIYUV= {
+ FF_CSP_420P,_l("YV12"),
+ 1,12, //Bpp
+ 3, //numplanes
+ {0,1,1,0}, //shiftX
+ {0,1,1,0}, //shiftY
+ {0,128,128,0}, //black,
+ FOURCC_IYUV, FOURCC_IYUV, &MEDIASUBTYPE_IYUV
};
-TcspInfo cspInfoNV21=
-{
- FF_CSP_NV12,_l("NV21"),
- 1,12, //Bpp
- 2, //numplanes
- {0,0,0,0}, //shiftX
- {0,1,1,0}, //shiftY
- {0,128,128,0}, //black
- FOURCC_NV21, FOURCC_NV21, &MEDIASUBTYPE_NV21
+TcspInfo cspInfoNV21= {
+ FF_CSP_NV12,_l("NV21"),
+ 1,12, //Bpp
+ 2, //numplanes
+ {0,0,0,0}, //shiftX
+ {0,1,1,0}, //shiftY
+ {0,128,128,0}, //black
+ FOURCC_NV21, FOURCC_NV21, &MEDIASUBTYPE_NV21
};
-const TcspFcc cspFccs[]=
-{
- _l("YV12") ,FOURCC_YV12,FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ,false,true,
- _l("I420/IYUV"),FOURCC_I420,FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ|FF_CSP_FLAGS_YUV_ORDER,false,true,
- _l("YUY2") ,FOURCC_YUY2,FF_CSP_YUY2,false,true,
- _l("YVYU") ,FOURCC_YVYU,FF_CSP_YVYU,false,true,
- _l("UYVY") ,FOURCC_UYVY,FF_CSP_UYVY,false,true,
- _l("VYUY") ,FOURCC_VYUY,FF_CSP_VYUY,false,true,
- _l("RGB32") ,FOURCC_RGB3,FF_CSP_RGB32,true,true,
- _l("RGB24") ,FOURCC_RGB2,FF_CSP_RGB24,true,true,
- _l("RGB555") ,FOURCC_RGB5,FF_CSP_RGB15,true,true,
- _l("RGB565") ,FOURCC_RGB6,FF_CSP_RGB16,true,true,
- _l("CLJR") ,FOURCC_CLJR,FF_CSP_CLJR,false,false,
- _l("Y800") ,FOURCC_Y800,FF_CSP_Y800,false,true,
- _l("NV12") ,FOURCC_NV12,FF_CSP_NV12,false,false,
- _l("NV21") ,FOURCC_NV21,FF_CSP_NV12|FF_CSP_FLAGS_YUV_ORDER,false,false,
- NULL,0
+const TcspFcc cspFccs[]= {
+ _l("YV12") ,FOURCC_YV12,FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ,false,true,
+ _l("I420/IYUV"),FOURCC_I420,FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ|FF_CSP_FLAGS_YUV_ORDER,false,true,
+ _l("YUY2") ,FOURCC_YUY2,FF_CSP_YUY2,false,true,
+ _l("YVYU") ,FOURCC_YVYU,FF_CSP_YVYU,false,true,
+ _l("UYVY") ,FOURCC_UYVY,FF_CSP_UYVY,false,true,
+ _l("VYUY") ,FOURCC_VYUY,FF_CSP_VYUY,false,true,
+ _l("RGB32") ,FOURCC_RGB3,FF_CSP_RGB32,true,true,
+ _l("RGB24") ,FOURCC_RGB2,FF_CSP_RGB24,true,true,
+ _l("RGB555") ,FOURCC_RGB5,FF_CSP_RGB15,true,true,
+ _l("RGB565") ,FOURCC_RGB6,FF_CSP_RGB16,true,true,
+ _l("CLJR") ,FOURCC_CLJR,FF_CSP_CLJR,false,false,
+ _l("Y800") ,FOURCC_Y800,FF_CSP_Y800,false,true,
+ _l("NV12") ,FOURCC_NV12,FF_CSP_NV12,false,false,
+ _l("NV21") ,FOURCC_NV21,FF_CSP_NV12|FF_CSP_FLAGS_YUV_ORDER,false,false,
+ NULL,0
};
char_t* csp_getName(int csp,char_t *buf,size_t len)
{
- return csp_getName2(csp_getInfo(csp),csp,buf,len);
+ return csp_getName2(csp_getInfo(csp),csp,buf,len);
}
char_t* csp_getName2(const TcspInfo *cspInfo,int csp,char_t *buf,size_t len)
{
- const char_t *colorspaceName=cspInfo?cspInfo->name:_l("unknown");
- _sntprintf_s(buf,
- len,
- _TRUNCATE,
- _l("%s%s%s%s%s%s"),
- colorspaceName,
- csp & FF_CSP_FLAGS_VFLIP ? _l(",flipped") : _l(""),
- csp & FF_CSP_FLAGS_INTERLACED ? _l(",interlaced") : _l(""),
- csp & FF_CSP_FLAGS_YUV_ADJ ? _l(",adj") : _l(""),
- csp & FF_CSP_FLAGS_YUV_ORDER ? _l(",VU") : _l(""),
- csp & FF_CSP_FLAGS_YUV_JPEG ? _l(",JPEG") : _l(""));
- return buf;
+ const char_t *colorspaceName=cspInfo?cspInfo->name:_l("unknown");
+ _sntprintf_s(buf,
+ len,
+ _TRUNCATE,
+ _l("%s%s%s%s%s%s"),
+ colorspaceName,
+ csp & FF_CSP_FLAGS_VFLIP ? _l(",flipped") : _l(""),
+ csp & FF_CSP_FLAGS_INTERLACED ? _l(",interlaced") : _l(""),
+ csp & FF_CSP_FLAGS_YUV_ADJ ? _l(",adj") : _l(""),
+ csp & FF_CSP_FLAGS_YUV_ORDER ? _l(",VU") : _l(""),
+ csp & FF_CSP_FLAGS_YUV_JPEG ? _l(",JPEG") : _l(""));
+ return buf;
}
const TcspInfo* csp_getInfoFcc(FOURCC fcccsp)
{
- if (fcccsp==FOURCC_IYUV || fcccsp==FOURCC_I420)
- return &cspInfoIYUV;
- else
- {
- for (int i=0;i<FF_CSPS_NUM;i++)
- if (cspInfos[i].fcccsp==fcccsp)
- return cspInfos+i;
- return NULL;
- }
+ if (fcccsp==FOURCC_IYUV || fcccsp==FOURCC_I420) {
+ return &cspInfoIYUV;
+ } else {
+ for (int i=0; i<FF_CSPS_NUM; i++)
+ if (cspInfos[i].fcccsp==fcccsp) {
+ return cspInfos+i;
+ }
+ return NULL;
+ }
}
int csp_bestMatch(int inCSP,int wantedCSPS,int *rank)
{
- int outCSP=inCSP&wantedCSPS&FF_CSPS_MASK;
- if (outCSP)
- {
- if (rank) *rank=100;
- return outCSP|(inCSP&~FF_CSPS_MASK);
- }
-
- const int *bestcsps=NULL;
- switch (inCSP&FF_CSPS_MASK)
- {
- case FF_CSP_420P:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_422P:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_YUY2 ,
- FF_CSP_420P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_444P:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_422P ,
- FF_CSP_420P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_411P:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_410P:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
+ int outCSP=inCSP&wantedCSPS&FF_CSPS_MASK;
+ if (outCSP) {
+ if (rank) {
+ *rank=100;
+ }
+ return outCSP|(inCSP&~FF_CSPS_MASK);
}
- case FF_CSP_YUY2:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_UYVY:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_YUY2 ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_YVYU:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_VYUY ,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_VYUY:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
+ const int *bestcsps=NULL;
+ switch (inCSP&FF_CSPS_MASK) {
+ case FF_CSP_420P: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_422P: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_YUY2 ,
+ FF_CSP_420P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_444P: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_422P ,
+ FF_CSP_420P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_411P: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_410P: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
- case FF_CSP_ABGR:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_RGBA:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_ABGR ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_BGR32:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_BGR24:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_RGB24,
- FF_CSP_BGR32,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_RGB32,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_BGR15:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_BGR32,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR24,
- FF_CSP_BGR16,
- FF_CSP_RGB32,
- FF_CSP_RGB24,
- FF_CSP_RGB15,
- FF_CSP_RGB16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_BGR16:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_BGR32,
- FF_CSP_BGR24,
- FF_CSP_BGR15,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_RGB32,
- FF_CSP_RGB24,
- FF_CSP_RGB15,
- FF_CSP_RGB16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_RGB32:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR15,
- FF_CSP_BGR16,
- FF_CSP_RGB15,
- FF_CSP_RGB16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_RGB24:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_BGR24,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR15,
- FF_CSP_BGR16,
- FF_CSP_RGB15,
- FF_CSP_RGB16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_RGB15:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_BGR15,
- FF_CSP_RGB32,
- FF_CSP_RGB24,
- FF_CSP_RGB16,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_BGR24,
- FF_CSP_BGR16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_RGB16:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_RGB15,
- FF_CSP_RGB32,
- FF_CSP_RGB24,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_BGR24,
- FF_CSP_BGR15,
- FF_CSP_BGR16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_PAL8:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_RGB32,
- FF_CSP_BGR32,
- FF_CSP_RGB24,
- FF_CSP_BGR24,
- FF_CSP_RGB15,
- FF_CSP_BGR15,
- FF_CSP_RGB16,
- FF_CSP_BGR16,
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
- }
- case FF_CSP_CLJR:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
+ case FF_CSP_YUY2: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_UYVY: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_YUY2 ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_YVYU: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_VYUY ,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_VYUY: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+
+ case FF_CSP_ABGR: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_RGBA: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_ABGR ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_BGR32: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_BGR24: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_RGB24,
+ FF_CSP_BGR32,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_RGB32,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_BGR15: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_BGR32,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB32,
+ FF_CSP_RGB24,
+ FF_CSP_RGB15,
+ FF_CSP_RGB16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_BGR16: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_BGR32,
+ FF_CSP_BGR24,
+ FF_CSP_BGR15,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_RGB32,
+ FF_CSP_RGB24,
+ FF_CSP_RGB15,
+ FF_CSP_RGB16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_RGB32: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR15,
+ FF_CSP_BGR16,
+ FF_CSP_RGB15,
+ FF_CSP_RGB16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_RGB24: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_BGR24,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR15,
+ FF_CSP_BGR16,
+ FF_CSP_RGB15,
+ FF_CSP_RGB16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_RGB15: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_BGR15,
+ FF_CSP_RGB32,
+ FF_CSP_RGB24,
+ FF_CSP_RGB16,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_BGR24,
+ FF_CSP_BGR16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_RGB16: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_RGB15,
+ FF_CSP_RGB32,
+ FF_CSP_RGB24,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_BGR24,
+ FF_CSP_BGR15,
+ FF_CSP_BGR16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_PAL8: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_RGB32,
+ FF_CSP_BGR32,
+ FF_CSP_RGB24,
+ FF_CSP_BGR24,
+ FF_CSP_RGB15,
+ FF_CSP_BGR15,
+ FF_CSP_RGB16,
+ FF_CSP_BGR16,
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_CLJR: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_Y800: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ case FF_CSP_NV12: {
+ static const int best[FF_CSPS_NUM]= {
+ FF_CSP_420P ,
+ FF_CSP_422P ,
+ FF_CSP_444P ,
+ FF_CSP_411P ,
+ FF_CSP_410P ,
+ FF_CSP_YUY2 ,
+ FF_CSP_UYVY ,
+ FF_CSP_YVYU ,
+ FF_CSP_VYUY ,
+ FF_CSP_ABGR ,
+ FF_CSP_RGBA ,
+ FF_CSP_BGR32,
+ FF_CSP_RGB32,
+ FF_CSP_BGR24,
+ FF_CSP_RGB24,
+ FF_CSP_BGR16,
+ FF_CSP_RGB16,
+ FF_CSP_BGR15,
+ FF_CSP_RGB15,
+ FF_CSP_NULL
+ };
+ bestcsps=best;
+ break;
+ }
+ default:
+ return FF_CSP_NULL;
}
- case FF_CSP_Y800:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
+ if (rank) {
+ *rank=99;
}
- case FF_CSP_NV12:
- {
- static const int best[FF_CSPS_NUM]=
- {
- FF_CSP_420P ,
- FF_CSP_422P ,
- FF_CSP_444P ,
- FF_CSP_411P ,
- FF_CSP_410P ,
- FF_CSP_YUY2 ,
- FF_CSP_UYVY ,
- FF_CSP_YVYU ,
- FF_CSP_VYUY ,
- FF_CSP_ABGR ,
- FF_CSP_RGBA ,
- FF_CSP_BGR32,
- FF_CSP_RGB32,
- FF_CSP_BGR24,
- FF_CSP_RGB24,
- FF_CSP_BGR16,
- FF_CSP_RGB16,
- FF_CSP_BGR15,
- FF_CSP_RGB15,
- FF_CSP_NULL
- };
- bestcsps=best;
- break;
+ while (*bestcsps) {
+ if (*bestcsps&wantedCSPS) {
+ return *bestcsps|(inCSP&~FF_CSPS_MASK);
+ }
+ bestcsps++;
+ if (rank) {
+ (*rank)--;
+ }
}
- default:return FF_CSP_NULL;
- }
- if (rank) *rank=99;
- while (*bestcsps)
- {
- if (*bestcsps&wantedCSPS)
- return *bestcsps|(inCSP&~FF_CSPS_MASK);
- bestcsps++;
- if (rank) (*rank)--;
- }
- return FF_CSP_NULL;
+ return FF_CSP_NULL;
}
bool TcspInfos::TsortFc::operator ()(const TcspInfo* &csp1,const TcspInfo* &csp2)
{
- int rank1;csp_bestMatch(csp,csp1->id,&rank1);
- int rank2;csp_bestMatch(csp,csp2->id,&rank2);
- return rank1>rank2;
+ int rank1;
+ csp_bestMatch(csp,csp1->id,&rank1);
+ int rank2;
+ csp_bestMatch(csp,csp2->id,&rank2);
+ return rank1>rank2;
}
/*void TcspInfos::sort(int csp)
{
diff --git a/src/thirdparty/MediaInfo/MediaInfoLib.vcproj b/src/thirdparty/MediaInfo/MediaInfoLib.vcproj index cf36f5a04..a917220e3 100644 --- a/src/thirdparty/MediaInfo/MediaInfoLib.vcproj +++ b/src/thirdparty/MediaInfo/MediaInfoLib.vcproj @@ -46,7 +46,7 @@ AdditionalIncludeDirectories=".;Source;../ZenLib;../zlib"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO"
- DisableSpecificWarnings="4065;4244;4390"
+ DisableSpecificWarnings="4065;4244;4309"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -105,7 +105,7 @@ AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO"
DebugInformationFormat="3"
- DisableSpecificWarnings="4065;4244;4267;4390"
+ DisableSpecificWarnings="4065;4244;4267;4309"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -164,7 +164,7 @@ AdditionalIncludeDirectories=".;Source;../ZenLib;../zlib"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO"
- DisableSpecificWarnings="4065;4244;4390"
+ DisableSpecificWarnings="4065;4244;4309"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -226,7 +226,7 @@ AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO"
EnableEnhancedInstructionSet="0"
- DisableSpecificWarnings="4065;4244;4267;4390"
+ DisableSpecificWarnings="4065;4244;4267;4309"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -446,6 +446,10 @@ >
</File>
<File
+ RelativePath=".\MediaInfo\Audio\File_Celt.cpp"
+ >
+ </File>
+ <File
RelativePath=".\MediaInfo\Audio\File_DolbyE.cpp"
>
</File>
@@ -1100,6 +1104,10 @@ >
</File>
<File
+ RelativePath=".\MediaInfo\Audio\File_Celt.h"
+ >
+ </File>
+ <File
RelativePath=".\MediaInfo\Audio\File_DolbyE.h"
>
</File>
diff --git a/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj b/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj index 6989662ff..4f5bb8005 100644 --- a/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj +++ b/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj @@ -40,6 +40,7 @@ <ClInclude Include="MediaInfo\Audio\File_Amv.h" />
<ClInclude Include="MediaInfo\Audio\File_Ape.h" />
<ClInclude Include="MediaInfo\Audio\File_Au.h" />
+ <ClInclude Include="MediaInfo\Audio\File_Celt.h" />
<ClInclude Include="MediaInfo\Audio\File_DolbyE.h" />
<ClInclude Include="MediaInfo\Audio\File_Dts.h" />
<ClInclude Include="MediaInfo\Audio\File_ExtendedModule.h" />
@@ -186,6 +187,7 @@ <ClCompile Include="MediaInfo\Audio\File_Amv.cpp" />
<ClCompile Include="MediaInfo\Audio\File_Ape.cpp" />
<ClCompile Include="MediaInfo\Audio\File_Au.cpp" />
+ <ClCompile Include="MediaInfo\Audio\File_Celt.cpp" />
<ClCompile Include="MediaInfo\Audio\File_DolbyE.cpp" />
<ClCompile Include="MediaInfo\Audio\File_Dts.cpp" />
<ClCompile Include="MediaInfo\Audio\File_ExtendedModule.cpp" />
@@ -382,7 +384,7 @@ <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4065;4244;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4065;4244;4309;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
@@ -397,7 +399,7 @@ <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <DisableSpecificWarnings>4065;4244;4267;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4065;4244;4267;4309;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
</ClCompile>
<Lib>
@@ -410,7 +412,7 @@ <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
- <DisableSpecificWarnings>4065;4244;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4065;4244;4309;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
@@ -428,7 +430,7 @@ <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB; MEDIAINFO_N19_NO; MEDIAINFO_OTHERTEXT_NO; MEDIAINFO_IMAGE_NO; MEDIAINFO_ARCHIVE_NO; MEDIAINFO_EVENTS_NO; MEDIAINFO_DEMUX_NO; MEDIAINFO_MPEGTS_DUPLICATE_NO; MEDIAINFO_DVDIF_ANALYZE_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
- <DisableSpecificWarnings>4065;4244;4267;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4065;4244;4267;4309;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
diff --git a/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj.filters b/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj.filters index 52d74defa..85b941bd0 100644 --- a/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj.filters +++ b/src/thirdparty/MediaInfo/MediaInfoLib.vcxproj.filters @@ -437,6 +437,9 @@ <ClInclude Include="MediaInfo\Audio\File_Au.h">
<Filter>Header Files\Audio</Filter>
</ClInclude>
+ <ClInclude Include="MediaInfo\Audio\File_Celt.h">
+ <Filter>Header Files\Audio</Filter>
+ </ClInclude>
<ClInclude Include="MediaInfo\Audio\File_DolbyE.h">
<Filter>Header Files\Audio</Filter>
</ClInclude>
@@ -880,6 +883,9 @@ <ClCompile Include="MediaInfo\Audio\File_Au.cpp">
<Filter>Source Files\Audio</Filter>
</ClCompile>
+ <ClCompile Include="MediaInfo\Audio\File_Celt.cpp">
+ <Filter>Source Files\Audio</Filter>
+ </ClCompile>
<ClCompile Include="MediaInfo\Audio\File_DolbyE.cpp">
<Filter>Source Files\Audio</Filter>
</ClCompile>
|