Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: webkit/plugins/ppapi/ppb_video_decoder_impl.cc

Issue 7021020: Clean up video frame sizes, types in Video Decode API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
index 5c317ee1ef105e94fc44ba976b8f744607052071..da72a3372e19b4804fb1c5f81f2f1eb454255f17 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
@@ -141,10 +141,6 @@ void CopyToPictureDev(const media::Picture& input, PP_Picture_Dev* output) {
DCHECK(output);
output->picture_buffer_id = input.picture_buffer_id();
output->bitstream_buffer_id = input.bitstream_buffer_id();
- output->visible_size =
- PP_MakeSize(input.visible_size().width(), input.visible_size().height());
- output->decoded_size =
- PP_MakeSize(input.decoded_size().width(), input.decoded_size().height());
}
void CopyToConfigList(
@@ -306,20 +302,14 @@ bool PPB_VideoDecoder_Impl::Abort(PP_CompletionCallback callback) {
}
void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
- uint32 requested_num_of_buffers,
- const gfx::Size& dimensions,
- media::VideoDecodeAccelerator::MemoryType type) {
+ uint32 requested_num_of_buffers, const gfx::Size& dimensions) {
if (!ppp_videodecoder_)
return;
- // TODO(vrk): Compiler assert or use switch statement instead of making
- // a blind cast.
- PP_PictureBufferType_Dev out_type =
- static_cast<PP_PictureBufferType_Dev>(type);
PP_Size out_dim = PP_MakeSize(dimensions.width(), dimensions.height());
ScopedResourceId resource(this);
ppp_videodecoder_->ProvidePictureBuffers(
- resource.id, requested_num_of_buffers, out_dim, out_type);
+ resource.id, requested_num_of_buffers, out_dim);
}
void PPB_VideoDecoder_Impl::PictureReady(const media::Picture& picture) {
@@ -424,9 +414,7 @@ SysmemBuffer::SysmemBuffer(const PP_SysmemBuffer_Dev& buffer)
Picture::Picture(const PP_Picture_Dev& picture)
: picture_buffer_id_(picture.picture_buffer_id),
- bitstream_buffer_id_(picture.bitstream_buffer_id),
- visible_size_(picture.visible_size.width, picture.visible_size.height),
- decoded_size_(picture.decoded_size.width, picture.decoded_size.height) {
+ bitstream_buffer_id_(picture.bitstream_buffer_id) {
}
} // namespace media
« ppapi/c/dev/ppp_video_decoder_dev.h ('K') | « webkit/plugins/ppapi/ppb_video_decoder_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698