mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Cosmetics in the y4m video provider

Browse source 
Originally committed to SVN as r3177.
This commit is contained in:
Karl Blomster 2009-07-19 22:51:19 +00:00
parent c329c4e047
commit 9e150d282d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/video_provider_yuv4mpeg.cpp
View file

@ -216,7 +216,7 @@ void YUV4MPEGVideoProvider::ParseFileHeader(const std::vector<wxString>& tags) {
int t_fps_num = -1; int t_fps_num = -1;
int t_fps_den = -1; int t_fps_den = -1;
Y4M_InterlacingMode t_imode = Y4M_ILACE_NOTSET; Y4M_InterlacingMode t_imode = Y4M_ILACE_NOTSET;
Y4M_PixelFormat t_pixfmt = Y4M_PIXFMT_NONE; Y4M_PixelFormat t_pixfmt = Y4M_PIXFMT_NONE;
for (unsigned i = 1; i < tags.size(); i++) { for (unsigned i = 1; i < tags.size(); i++) {
wxString tag = _T(""); wxString tag = _T("");
@ -242,8 +242,8 @@ void YUV4MPEGVideoProvider::ParseFileHeader(const std::vector<wxString>& tags) {
else if (tags.at(i).StartsWith(_T("C"), &tag)) { else if (tags.at(i).StartsWith(_T("C"), &tag)) {
// technically this should probably be case sensitive, // technically this should probably be case sensitive,
// but being liberal in what you accept doesn't hurt // but being liberal in what you accept doesn't hurt
if (!tag.CmpNoCase(_T("420jpeg"))) t_pixfmt = Y4M_PIXFMT_420JPEG; if (!tag.CmpNoCase(_T("420"))) t_pixfmt = Y4M_PIXFMT_420JPEG; // is this really correct?
else if (!tag.CmpNoCase(_T("420"))) t_pixfmt = Y4M_PIXFMT_420JPEG; // is this really correct? else if (!tag.CmpNoCase(_T("420jpeg"))) t_pixfmt = Y4M_PIXFMT_420JPEG;
else if (!tag.CmpNoCase(_T("420mpeg2"))) t_pixfmt = Y4M_PIXFMT_420MPEG2; else if (!tag.CmpNoCase(_T("420mpeg2"))) t_pixfmt = Y4M_PIXFMT_420MPEG2;
else if (!tag.CmpNoCase(_T("420paldv"))) t_pixfmt = Y4M_PIXFMT_420PALDV; else if (!tag.CmpNoCase(_T("420paldv"))) t_pixfmt = Y4M_PIXFMT_420PALDV;
else if (!tag.CmpNoCase(_T("411"))) t_pixfmt = Y4M_PIXFMT_411; else if (!tag.CmpNoCase(_T("411"))) t_pixfmt = Y4M_PIXFMT_411;

6
aegisub/src/video_provider_yuv4mpeg.h
View file

@ -51,9 +51,9 @@ class YUV4MPEGVideoProvider : public VideoProvider {
private: private:
enum Y4M_PixelFormat { enum Y4M_PixelFormat {
Y4M_PIXFMT_NONE = -1, Y4M_PIXFMT_NONE = -1,
Y4M_PIXFMT_420JPEG, Y4M_PIXFMT_420JPEG, // afaict the only difference between
Y4M_PIXFMT_420MPEG2, Y4M_PIXFMT_420MPEG2, // these three is the chroma sample location,
Y4M_PIXFMT_420PALDV, Y4M_PIXFMT_420PALDV, // and nobody cares about that.
Y4M_PIXFMT_411, Y4M_PIXFMT_411,
Y4M_PIXFMT_422, Y4M_PIXFMT_422,
Y4M_PIXFMT_444, Y4M_PIXFMT_444,