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

Side by Side Diff: media/video/picture.cc

Issue 7057027: Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/video/picture.h ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/picture.h" 5 #include "media/video/picture.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 BaseBuffer::~BaseBuffer() {}
10
9 // Implementations for the other constructors are found in 11 // Implementations for the other constructors are found in
10 // webkit/plugins/ppapi/ppb_video_decoder_impl.cc. 12 // webkit/plugins/ppapi/ppb_video_decoder_impl.cc.
11 // They are not included in this file because it would require 13 // They are not included in this file because it would require
12 // media/ to depend on files in ppapi/. 14 // media/ to depend on files in ppapi/.
13 BufferInfo::BufferInfo(int32 id, gfx::Size size) 15 BaseBuffer::BaseBuffer(int32 id, gfx::Size size) : id_(id), size_(size) {
14 : id_(id),
15 size_(size) {
16 } 16 }
17 17
18 GLESBuffer::GLESBuffer( 18 GLESBuffer::GLESBuffer(
19 int32 id, gfx::Size size, uint32 texture_id, uint32 context_id) 19 int32 id, gfx::Size size, uint32 texture_id, uint32 context_id)
20 : texture_id_(texture_id), 20 : BaseBuffer(id, size), texture_id_(texture_id), context_id_(context_id) {
21 context_id_(context_id),
22 info_(id, size) {
23 } 21 }
24 22
25 SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data) 23 SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
26 : data_(data), 24 : BaseBuffer(id, size), data_(data) {
27 info_(id, size) {
28 } 25 }
29 26
30 Picture::Picture(int32 picture_buffer_id, int32 bitstream_buffer_id, 27 Picture::Picture(int32 picture_buffer_id, int32 bitstream_buffer_id,
31 gfx::Size visible_size, gfx::Size decoded_size) 28 gfx::Size visible_size, gfx::Size decoded_size)
32 : picture_buffer_id_(picture_buffer_id), 29 : picture_buffer_id_(picture_buffer_id),
33 bitstream_buffer_id_(bitstream_buffer_id), 30 bitstream_buffer_id_(bitstream_buffer_id),
34 visible_size_(visible_size), 31 visible_size_(visible_size),
35 decoded_size_(decoded_size) { 32 decoded_size_(decoded_size) {
36 } 33 }
37 34
38 } // namespace media 35 } // namespace media
OLDNEW
« no previous file with comments | « media/video/picture.h ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698