summaryrefslogtreecommitdiffstats
path: root/media/video/picture.h
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 16:29:01 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 16:29:01 +0000
commitdc86745e034d7279a6ec8c1cee7e5f85b448eb49 (patch)
tree58ff866fee71c5f6f1af4484fa6db4fb03e30782 /media/video/picture.h
parentd3388bf4d86a1bc04d62bab777161db5ce51b101 (diff)
downloadchromium_src-dc86745e034d7279a6ec8c1cee7e5f85b448eb49.zip
chromium_src-dc86745e034d7279a6ec8c1cee7e5f85b448eb49.tar.gz
chromium_src-dc86745e034d7279a6ec8c1cee7e5f85b448eb49.tar.bz2
Random cleanup & improvements to OmxVideoDecodeAccelerator:
- Rip out support for HW decode to sysmem buffers from OVDA (which doesn't work and for which we don't have a need (yet)). - Deliver on the promise of Picture to provide a bitstream buffer id from which the picture was decoded by propagating the bitstream buffer id from input buffers (BitstreamBuffer) to output buffers (Picture) through OMX_BUFFERHEADERTYPE's nTimeStamp field (HACK!). Now checking for this in the test. - Free output buffers uniformly: both dismiss from OMX & from client at the same time, during OnStateChangeExecutingToIdle, instead of freeing from OMX during OnStateChangeExecutingToIdle and from client during OnPortCommandFlush. - Clean up OVDA implementation: - Replaced unnecessary OMX_AllocateBuffer with OMX_UseBuffer. - Unify two parallel vector<>s (one of which is of pairs) into a single map<id, struct> to ease readability and to increase robustness (should be harder now to have these data items fall out of sync with each other). - Removed unnecessary output_buffer_count_ field. - Removed unused field output_buffer_size_. - Replaced use of explicitly-managed omx_buff_ids_ map with implicit use of pAppPrivate field on input buffer headers. BUG=none TEST=run the test per instructions in http://codereview.chromium.org/7112019 Review URL: http://codereview.chromium.org/6993051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/picture.h')
-rw-r--r--media/video/picture.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/video/picture.h b/media/video/picture.h
index 860a4ee..e268c51 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -92,13 +92,14 @@ class Picture {
}
// Returns the id of the bitstream buffer from which this frame was decoded.
- // TODO(fischman,vrk): Remove this field; pictures can span arbitrarily many
- // BitstreamBuffers, and it's not clear what clients would do with this
- // information, anyway.
int32 bitstream_buffer_id() const {
return bitstream_buffer_id_;
}
+ void set_bitstream_buffer_id(int32 bitstream_buffer_id) {
+ bitstream_buffer_id_ = bitstream_buffer_id;
+ }
+
// Returns the visible size of the decoded picture in pixels.
gfx::Size visible_size() const {
return visible_size_;