Skip to content

for default mjpg output , convert to other support type #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ob-tim-liu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

for default mjpg output , convert to other support type #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions escapi_dll/capture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,13 @@ int CaptureClass::isMediaOk(IMFMediaType *aType, int aIndex)
break;
}
}

if (found)
{
hr = setVideoType(aType);
}
}

return found;
}

Expand Down Expand Up @@ -660,15 +666,21 @@ HRESULT CaptureClass::initCapture(int aDevice)

DO_OR_DIE_CRITSECTION;

hr = setVideoType(type);

DO_OR_DIE_CRITSECTION;

hr = mReader->SetCurrentMediaType(
(DWORD)MF_SOURCE_READER_FIRST_VIDEO_STREAM,
NULL,
type
);
//for default mjpg type , convert to other support type
if (isMediaOk(type, preferredmode))
hr = 0;
else
hr = -1;

//hr = setVideoType(type);
//
//DO_OR_DIE_CRITSECTION;

//hr = mReader->SetCurrentMediaType(
// (DWORD)MF_SOURCE_READER_FIRST_VIDEO_STREAM,
// NULL,
// type
//);

DO_OR_DIE_CRITSECTION;

Expand Down