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

Allow for spatial-downsampling without reinitializaing encoder. Change of frame

Browse Source 
size will automatically trigger new key frame in codec. This feature is set off
in video engine until we upgrade to a newer version of libvpx.
Review URL: https://webrtc-codereview.appspot.com/427003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1827 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2012-03-02 16:48:36 +00:00
parent 9457422032
commit 26762e3e40
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/video_coding/codecs/vp8/main/interface/vp8.h
View File

@ -109,6 +109,10 @@ class VP8Encoder : public VideoEncoder {
// Call encoder initialize function and set control settings. // Call encoder initialize function and set control settings.
int InitAndSetControlSettings(); int InitAndSetControlSettings();
// Update frame size for codec.
int UpdateCodecFrameSize(WebRtc_UWord32 input_image_width,
WebRtc_UWord32 input_image_height);
void PopulateCodecSpecific(CodecSpecificInfo* codec_specific, void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
const vpx_codec_cx_pkt& pkt); const vpx_codec_cx_pkt& pkt);

33
src/modules/video_coding/codecs/vp8/main/source/vp8.cc
View File

@ -324,6 +324,15 @@ int VP8Encoder::Encode(const RawImage& input_image,
if (encoded_complete_callback_ == NULL) { if (encoded_complete_callback_ == NULL) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED; return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
} }
// Check for change in frame size.
if (input_image._width != codec_.width ||
input_image._height != codec_.height) {
int ret = UpdateCodecFrameSize(input_image._width, input_image._height);
if (ret < 0) {
return ret;
}
}
// image in vpx_image_t format // image in vpx_image_t format
raw_->planes[PLANE_Y] = input_image._buffer; raw_->planes[PLANE_Y] = input_image._buffer;
raw_->planes[PLANE_U] = &input_image._buffer[codec_.height * codec_.width]; raw_->planes[PLANE_U] = &input_image._buffer[codec_.height * codec_.width];
@ -376,6 +385,30 @@ int VP8Encoder::Encode(const RawImage& input_image,
#endif #endif
} }
int VP8Encoder::UpdateCodecFrameSize(WebRtc_UWord32 input_image_width,
WebRtc_UWord32 input_image_height) {
codec_.width = input_image_width;
codec_.height = input_image_height;
raw_->w = codec_.width;
raw_->h = codec_.height;
raw_->d_w = codec_.width;
raw_->d_h = codec_.height;
raw_->stride[VPX_PLANE_Y] = codec_.width;
raw_->stride[VPX_PLANE_U] = codec_.width / 2;
raw_->stride[VPX_PLANE_V] = codec_.width / 2;
vpx_img_set_rect(raw_, 0, 0, codec_.width, codec_.height);
// Update encoder context for new frame size.
// Change of frame size will automatically trigger a key frame.
config_->g_w = codec_.width;
config_->g_h = codec_.height;
if (vpx_codec_enc_config_set(encoder_, config_)) {
return WEBRTC_VIDEO_CODEC_ERROR;
}
return WEBRTC_VIDEO_CODEC_OK;
}
void VP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific, void VP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
const vpx_codec_cx_pkt& pkt) { const vpx_codec_cx_pkt& pkt) {
assert(codec_specific != NULL); assert(codec_specific != NULL);