wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1051566: Support H.264 Mode 0 in GMP OpenH264 r=ehugg

Browse Source
This commit is contained in:
Randell Jesup 2014-08-11 17:13:59 -04:00
parent 9116db6c8d
commit 02a26f0243
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
View File

@ -198,12 +198,14 @@ WebrtcGmpVideoEncoder::InitEncode_g(const webrtc::VideoCodec* aCodecSettings,
codec.mMinBitrate = aCodecSettings->minBitrate;
codec.mMaxBitrate = aCodecSettings->maxBitrate;
codec.mMaxFramerate = aCodecSettings->maxFramerate;
if (aCodecSettings->codecSpecific.H264.packetizationMode == 1) {
aMaxPayloadSize = 4*1024*1024; // insanely large
}
// Pass dummy codecSpecific data for now...
nsTArray<uint8_t> codecSpecific;
// H.264 mode 1 only supported so far
GMPErr err = mGMP->InitEncode(codec, codecSpecific, this, 1, 1024*1024 /*aMaxPayloadSize*/);
GMPErr err = mGMP->InitEncode(codec, codecSpecific, this, 1, aMaxPayloadSize);
if (err != GMPNoErr) {
return WEBRTC_VIDEO_CODEC_ERROR;
}

5
media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
View File

@ -2861,8 +2861,11 @@ int vcmGetVideoCodecList(int request_type)
*/
int vcmGetH264SupportedPacketizationModes()
{
// We support mode 1 packetization only in webrtc currently
#ifdef MOZ_WEBRTC_OMX
return VCM_H264_MODE_1;
#else
return VCM_H264_MODE_0|VCM_H264_MODE_1;
#endif
}
/**