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

Setting correct stride for VP8 encoder

Browse Source 
BUG=1137

Review URL: https://webrtc-codereview.appspot.com/929024

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3140 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2012-11-21 00:15:19 +00:00
parent 32b3f40b6c
commit 3263a7a616
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
View File

@ -346,7 +346,7 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
// Check for change in frame size. // Check for change in frame size.
if (input_image.width() != codec_.width || if (input_image.width() != codec_.width ||
input_image.height() != codec_.height) { input_image.height() != codec_.height) {
int ret = UpdateCodecFrameSize(input_image.width(), input_image.height()); int ret = UpdateCodecFrameSize(input_image);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -356,6 +356,10 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
// TODO(mikhal): Stride should be set in initialization.
raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
raw_->stride[VPX_PLANE_V] = input_image.stride(kVPlane);
int flags = 0; int flags = 0;
#if WEBRTC_LIBVPX_VERSION >= 971 #if WEBRTC_LIBVPX_VERSION >= 971
@ -404,18 +408,17 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
#endif #endif
} }
int VP8EncoderImpl::UpdateCodecFrameSize(WebRtc_UWord32 input_image_width, int VP8EncoderImpl::UpdateCodecFrameSize(const I420VideoFrame& input_image) {
WebRtc_UWord32 input_image_height) { codec_.width = input_image.width();
codec_.width = input_image_width; codec_.height = input_image.height();
codec_.height = input_image_height;
raw_->w = codec_.width; raw_->w = codec_.width;
raw_->h = codec_.height; raw_->h = codec_.height;
raw_->d_w = codec_.width; raw_->d_w = codec_.width;
raw_->d_h = codec_.height; raw_->d_h = codec_.height;
raw_->stride[VPX_PLANE_Y] = codec_.width;
raw_->stride[VPX_PLANE_U] = codec_.width / 2; raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
raw_->stride[VPX_PLANE_V] = codec_.width / 2; raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
raw_->stride[VPX_PLANE_V] = input_image.stride(kVPlane);
vpx_img_set_rect(raw_, 0, 0, codec_.width, codec_.height); vpx_img_set_rect(raw_, 0, 0, codec_.width, codec_.height);
// Update encoder context for new frame size. // Update encoder context for new frame size.
@ -871,9 +874,10 @@ int VP8DecoderImpl::ReturnFrame(const vpx_image_t* img, uint32_t timestamp) {
// Decoder OK and NULL image => No show frame // Decoder OK and NULL image => No show frame
return WEBRTC_VIDEO_CODEC_NO_OUTPUT; return WEBRTC_VIDEO_CODEC_NO_OUTPUT;
} }
int half_height = (img->d_h + 1) / 2;
int size_y = img->stride[VPX_PLANE_Y] * img->d_h; int size_y = img->stride[VPX_PLANE_Y] * img->d_h;
int size_u = img->stride[VPX_PLANE_U] * ((img->d_h + 1) / 2); int size_u = img->stride[VPX_PLANE_U] * half_height;
int size_v = img->stride[VPX_PLANE_V] * ((img->d_h + 1) / 2); int size_v = img->stride[VPX_PLANE_V] * half_height;
// TODO(mikhal): This does a copy - need to SwapBuffers. // TODO(mikhal): This does a copy - need to SwapBuffers.
decoded_image_.CreateFrame(size_y, img->planes[VPX_PLANE_Y], decoded_image_.CreateFrame(size_y, img->planes[VPX_PLANE_Y],
size_u, img->planes[VPX_PLANE_U], size_u, img->planes[VPX_PLANE_U],

3
webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
View File

@ -108,8 +108,7 @@ class VP8EncoderImpl : public VP8Encoder {
int InitAndSetControlSettings(const VideoCodec* inst); int InitAndSetControlSettings(const VideoCodec* inst);
// Update frame size for codec. // Update frame size for codec.
int UpdateCodecFrameSize(WebRtc_UWord32 input_image_width, int UpdateCodecFrameSize(const I420VideoFrame& input_image);
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,