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

VP8 wrapper: Adding an IFDEF prior to new interface. This will allow the wrapper to build with the Bali release.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@99 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@google.com 2011-06-20 05:28:08 +00:00
parent f5ca23dfff
commit ab0cfe66a9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video_coding/codecs/vp8/main/interface/vp8.h
View File

@ -142,8 +142,9 @@ private:
// - optimalBuffersize : Optimal buffer size // - optimalBuffersize : Optimal buffer size
// Return Value : Max target size for Intra frames represented as // Return Value : Max target size for Intra frames represented as
// percentage of the per frame bandwidth // percentage of the per frame bandwidth
#ifdef VP8_LATEST
WebRtc_Word32 MaxIntraTarget(WebRtc_Word32 optimalBuffersize); WebRtc_Word32 MaxIntraTarget(WebRtc_Word32 optimalBuffersize);
#endif
EncodedImage _encodedImage; EncodedImage _encodedImage;
EncodedImageCallback* _encodedCompleteCallback; EncodedImageCallback* _encodedCompleteCallback;
WebRtc_Word32 _width; WebRtc_Word32 _width;

6
modules/video_coding/codecs/vp8/main/source/vp8.cc
View File

@ -30,6 +30,7 @@
#define VP8_FREQ_HZ 90000 #define VP8_FREQ_HZ 90000
//#define DEV_PIC_LOSS //#define DEV_PIC_LOSS
//#define VP8_LATEST
namespace webrtc namespace webrtc
{ {
@ -291,8 +292,9 @@ VP8Encoder::InitEncode(const VideoCodec* inst,
_cfg->rc_buf_initial_sz = 500; _cfg->rc_buf_initial_sz = 500;
_cfg->rc_buf_optimal_sz = 600; _cfg->rc_buf_optimal_sz = 600;
_cfg->rc_buf_sz = 1000; _cfg->rc_buf_sz = 1000;
#ifdef VP8_LATEST
_cfg->rc_max_intra_bitrate_pct = MaxIntraTarget(_cfg->rc_buf_optimal_sz); _cfg->rc_max_intra_bitrate_pct = MaxIntraTarget(_cfg->rc_buf_optimal_sz);
#endif
#ifdef DEV_PIC_LOSS #ifdef DEV_PIC_LOSS
@ -354,6 +356,7 @@ VP8Encoder::InitAndSetSpeed()
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
#ifdef VP8_LATEST
WebRtc_Word32 WebRtc_Word32
VP8Encoder::MaxIntraTarget(WebRtc_Word32 optimalBuffersize) VP8Encoder::MaxIntraTarget(WebRtc_Word32 optimalBuffersize)
{ {
@ -370,6 +373,7 @@ VP8Encoder::MaxIntraTarget(WebRtc_Word32 optimalBuffersize)
return targetPct; return targetPct;
} }
#endif
WebRtc_Word32 WebRtc_Word32
VP8Encoder::Encode(const RawImage& inputImage, VP8Encoder::Encode(const RawImage& inputImage,