zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete VideoCaptureCapability::codecType and related logic.

Browse Source 
The video_capture module includes remnants of support for cameras
producing encoded frames. However, this seems to be unused, and is
explicitly not supported by VideoCaptureImpl::IncomingFrame.

BUG=None

Review-Url: https://codereview.webrtc.org/2668693008
Cr-Commit-Position: refs/heads/master@{#16732}
This commit is contained in:
nisse
2017-02-20 23:27:37 -08:00
committed by Commit bot
parent 7e560a1bb7
commit 1e32122168
6 changed files with 66 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
webrtc/modules/video_capture/device_info_impl.cc
View File

@ -154,7 +154,6 @@ int32_t DeviceInfoImpl::GetBestMatchedCapability(
int32_t bestHeight = 0;
int32_t bestFrameRate = 0;
RawVideoType bestRawType = kVideoUnknown;
webrtc::VideoCodecType bestCodecType = webrtc::kVideoCodecUnknown;
const int32_t numberOfCapabilies =
static_cast<int32_t>(_captureCapabilities.size());
@ -201,7 +200,6 @@ int32_t DeviceInfoImpl::GetBestMatchedCapability(
|| capability.rawType == kVideoYUY2
|| capability.rawType == kVideoYV12))
{
bestCodecType = capability.codecType;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
@ -210,54 +208,36 @@ int32_t DeviceInfoImpl::GetBestMatchedCapability(
&& capability.width == requested.width
&& capability.maxFPS >= requested.maxFPS)
{
if (capability.codecType == requested.codecType
&& bestCodecType != requested.codecType)
{
bestCodecType = capability.codecType;
bestformatIndex = tmp;
}
bestformatIndex = tmp;
}
}
else // Better frame rate
{
if (requested.codecType == capability.codecType)
{
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestCodecType = capability.codecType;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
}
}
else // Better width than previously
{
if (requested.codecType == capability.codecType)
{
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestCodecType = capability.codecType;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
}// else width no good
}
else // Better height
{
if (requested.codecType == capability.codecType)
{
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestCodecType = capability.codecType;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
bestWidth = capability.width;
bestHeight = capability.height;
bestFrameRate = capability.maxFPS;
bestRawType = capability.rawType;
bestformatIndex = tmp;
}
}// else height not good
}//end for