jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2010 from wanhongqing123/master 

win-dshow: fix H264 to mjpeg issue
master
Jim 2019-11-12 17:32:36 -08:00 committed by GitHub
parent d357e1eb6e 9b4d9c6788
commit b731b3eea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/win-dshow/win-dshow.cpp
View File

@ -468,6 +468,12 @@ static inline enum speaker_layout convert_speaker_layout(uint8_t channels)
void DShowInput::OnEncodedVideoData(enum AVCodecID id, unsigned char *data,
size_t size, long long ts)
{
/* If format changes, free and allow it to recreate the decoder */
if (ffmpeg_decode_valid(video_decoder) &&
video_decoder->codec->id != id) {
ffmpeg_decode_free(video_decoder);
}
if (!ffmpeg_decode_valid(video_decoder)) {
/* Only use MJPEG hardware decoding on resolutions higher
* than 1920x1080. The reason why is because we want to strike