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

Side by Side Diff: webkit/plugins/ppapi/ppb_video_decoder_impl.h

Issue 7204038: Fix PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer to use correct ID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 6 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 | « ppapi/examples/gles2/gles2.cc ('k') | webkit/plugins/ppapi/ppb_video_decoder_impl.cc » ('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 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 virtual void PictureReady(const media::Picture& picture) OVERRIDE; 68 virtual void PictureReady(const media::Picture& picture) OVERRIDE;
69 virtual void NotifyInitializeDone() OVERRIDE; 69 virtual void NotifyInitializeDone() OVERRIDE;
70 virtual void NotifyEndOfStream() OVERRIDE; 70 virtual void NotifyEndOfStream() OVERRIDE;
71 virtual void NotifyError( 71 virtual void NotifyError(
72 media::VideoDecodeAccelerator::Error error) OVERRIDE; 72 media::VideoDecodeAccelerator::Error error) OVERRIDE;
73 virtual void NotifyFlushDone() OVERRIDE; 73 virtual void NotifyFlushDone() OVERRIDE;
74 virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE; 74 virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE;
75 virtual void NotifyAbortDone() OVERRIDE; 75 virtual void NotifyAbortDone() OVERRIDE;
76 76
77 private: 77 private:
78 // Key: bitstream_buffer_id, value: callback to run when bitstream decode is
79 // done.
80 typedef std::map<int32, PP_CompletionCallback> CallbackById;
81
78 // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is 82 // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
79 // swapped with another. 83 // swapped with another.
80 scoped_ptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_; 84 scoped_ptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_;
81 85
82 // Factory to produce our callbacks. 86 // Factory to produce our callbacks.
83 base::ScopedCallbackFactory<PPB_VideoDecoder_Impl> callback_factory_; 87 base::ScopedCallbackFactory<PPB_VideoDecoder_Impl> callback_factory_;
84 88
85 PP_CompletionCallback initialization_callback_; 89 PP_CompletionCallback initialization_callback_;
86 PP_CompletionCallback abort_callback_; 90 PP_CompletionCallback abort_callback_;
87 PP_CompletionCallback flush_callback_; 91 PP_CompletionCallback flush_callback_;
88 PP_CompletionCallback bitstream_buffer_callback_; 92 CallbackById bitstream_buffer_callbacks_;
89 93
90 // Reference to the plugin requesting this interface. 94 // Reference to the plugin requesting this interface.
91 const PPP_VideoDecoder_Dev* ppp_videodecoder_; 95 const PPP_VideoDecoder_Dev* ppp_videodecoder_;
92 96
93 DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl); 97 DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
94 }; 98 };
95 99
96 } // namespace ppapi 100 } // namespace ppapi
97 } // namespace webkit 101 } // namespace webkit
98 102
99 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 103 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
OLDNEW
« no previous file with comments | « ppapi/examples/gles2/gles2.cc ('k') | webkit/plugins/ppapi/ppb_video_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698