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

Review URL: http://webrtc-codereview.appspot.com/34004

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@59 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@google.com 2011-06-08 16:48:01 +00:00
parent f13546cf99
commit fea5f7e30e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,7 @@ private:
WebRtc_Word32 _maxBitRateKbit; WebRtc_Word32 _maxBitRateKbit;
int _maxFrameRate; int _maxFrameRate;
bool _inited; bool _inited;
WebRtc_UWord32 _timeStamp;
WebRtc_UWord16 _pictureID; WebRtc_UWord16 _pictureID;
bool _pictureLossIndicationOn; bool _pictureLossIndicationOn;
bool _feedbackModeOn; bool _feedbackModeOn;

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

@ -41,6 +41,7 @@ VP8Encoder::VP8Encoder():
_height(0), _height(0),
_maxBitRateKbit(0), _maxBitRateKbit(0),
_inited(false), _inited(false),
_timeStamp(0),
_pictureID(0), _pictureID(0),
_pictureLossIndicationOn(false), _pictureLossIndicationOn(false),
_feedbackModeOn(false), _feedbackModeOn(false),
@ -132,6 +133,8 @@ VP8Encoder::Reset()
_encoder = NULL; _encoder = NULL;
} }
_timeStamp = 0;
_encoder = new vpx_codec_ctx_t; _encoder = new vpx_codec_ctx_t;
return InitAndSetSpeed(); return InitAndSetSpeed();
@ -166,7 +169,7 @@ VP8Encoder::SetRates(WebRtc_UWord32 newBitRateKbit, WebRtc_UWord32 newFrameRate)
{ {
_maxFrameRate = static_cast<int>(newFrameRate); _maxFrameRate = static_cast<int>(newFrameRate);
_cfg->g_timebase.num = 1; _cfg->g_timebase.num = 1;
_cfg->g_timebase.den = _maxFrameRate;//VP8_FREQ_HZ; _cfg->g_timebase.den = _maxFrameRate;
} }
// update encoder context // update encoder context
@ -231,6 +234,7 @@ VP8Encoder::InitEncode(const VideoCodec* inst,
_raw = new vpx_image_t; _raw = new vpx_image_t;
} }
_timeStamp = 0;
_maxBitRateKbit = inst->maxBitrate; _maxBitRateKbit = inst->maxBitrate;
_maxFrameRate = inst->maxFramerate; _maxFrameRate = inst->maxFramerate;
_width = inst->width; _width = inst->width;
@ -494,10 +498,11 @@ VP8Encoder::Encode(const RawImage& inputImage,
_encodedImage._frameType = kDeltaFrame; _encodedImage._frameType = kDeltaFrame;
} }
if (vpx_codec_encode(_encoder, _raw, _maxFrameRate * inputImage._timeStamp / VP8_FREQ_HZ, 1, flags, VPX_DL_REALTIME)) if (vpx_codec_encode(_encoder, _raw, _timeStamp, 1, flags, VPX_DL_REALTIME))
{ {
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
_timeStamp++;
const vpx_codec_cx_pkt_t *pkt= vpx_codec_get_cx_data(_encoder, &iter); // no lagging => 1 frame at a time const vpx_codec_cx_pkt_t *pkt= vpx_codec_get_cx_data(_encoder, &iter); // no lagging => 1 frame at a time
if (pkt == NULL && !_encoder->err) if (pkt == NULL && !_encoder->err)
@ -732,7 +737,7 @@ VP8Decoder::Decode(const EncodedImage& inputImage,
img = vpx_codec_get_frame(_decoder, &_iter); img = vpx_codec_get_frame(_decoder, &_iter);
// Allocate memory for decoded image // Allocate memory for decoded image
WebRtc_UWord32 requiredSize = (3*img->h*img->w) >> 1; WebRtc_UWord32 requiredSize = (3*img->h * img->w) >> 1;
if (_decodedImage._buffer != NULL) if (_decodedImage._buffer != NULL)
{ {
delete [] _decodedImage._buffer; delete [] _decodedImage._buffer;
@ -773,8 +778,8 @@ VP8Decoder::Decode(const EncodedImage& inputImage,
// we need to communicate that we should send a RPSI with a specific picture ID // we need to communicate that we should send a RPSI with a specific picture ID
// TODO(pw): how do we know it's a golden or alt reference frame? On2 will provide an API // TODO(pw): how do we know it's a golden or alt reference frame? libvpx will
// for now I added it temporarily // provide an API for now I added it temporarily
if((lastRefUpdates & VP8_GOLD_FRAME) || (lastRefUpdates & VP8_ALTR_FRAME)) if((lastRefUpdates & VP8_GOLD_FRAME) || (lastRefUpdates & VP8_ALTR_FRAME))
{ {
if (!missingFrames && (inputImage._completeFrame == true)) if (!missingFrames && (inputImage._completeFrame == true))