generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed experiment.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/345005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1413 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pwestin@webrtc.org
2012-01-12 15:35:28 +00:00
parent ad4af57abd
commit 9cbe6867e7
5 changed files with 6 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/video_coding/main/source/codec_database.cc
View File

@@ -26,7 +26,6 @@
// Supported codecs
#ifdef VIDEOCODEC_VP8
#include "vp8.h"
#include "vp8_simulcast.h"
#endif
#ifdef VIDEOCODEC_I420
#include "i420.h"
@@ -95,7 +94,7 @@ VCMCodecDataBase::Version(WebRtc_Word8* version,
{
return ret;
}
encoder = CreateEncoder(settings.codecType, false);
encoder = CreateEncoder(settings.codecType);
if (encoder == NULL)
{
return VCM_MEMORY;
@@ -138,25 +137,17 @@ VCMCodecDataBase::ResetSender()
}
VCMGenericEncoder* VCMCodecDataBase::CreateEncoder(
const VideoCodecType type,
const bool simulcast) const {
const VideoCodecType type) const {
switch(type)
{
#ifdef VIDEOCODEC_VP8
case kVideoCodecVP8:
if (simulcast) {
return new VCMGenericEncoder(*(new VP8SimulcastEncoder));
} else {
return new VCMGenericEncoder(*(new VP8Encoder));
}
return new VCMGenericEncoder(*(new VP8Encoder));
#endif
#ifdef VIDEOCODEC_I420
case kVideoCodecI420:
if (!simulcast) {
return new VCMGenericEncoder(*(new I420Encoder));
}
return NULL;
return new VCMGenericEncoder(*(new I420Encoder));
#endif
default:
return NULL;
@@ -400,12 +391,7 @@ VCMCodecDataBase::SetEncoder(const VideoCodec* settings,
}
else
{
bool simulcast = false;
if (settings->numberOfSimulcastStreams > 1)
{
simulcast = true;
}
_ptrEncoder = CreateEncoder(settings->codecType, simulcast);
_ptrEncoder = CreateEncoder(settings->codecType);
_currentEncIsExternal = false;
}
VCMencodedFrameCallback->SetPayloadType(settings->plType);

3
src/modules/video_coding/main/source/codec_database.h
View File

@@ -182,8 +182,7 @@ protected:
/**
* Create an internal Encoder given a codec type
*/
VCMGenericEncoder* CreateEncoder(const VideoCodecType type,
const bool simulcast) const;
VCMGenericEncoder* CreateEncoder(const VideoCodecType type) const;
void DeleteEncoder();
/*