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

Side by Side Diff: media/base/video_decoder.h

Issue 339653003: No EOS frame in {Audio|Video}Decoder::OutputCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 MEDIA_BASE_VIDEO_DECODER_H_ 5 #ifndef MEDIA_BASE_VIDEO_DECODER_H_
6 #define MEDIA_BASE_VIDEO_DECODER_H_ 6 #define MEDIA_BASE_VIDEO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 11 matching lines...) Expand all
22 // Status codes for decode operations on VideoDecoder. 22 // Status codes for decode operations on VideoDecoder.
23 // TODO(rileya): Now that both AudioDecoder and VideoDecoder Status enums 23 // TODO(rileya): Now that both AudioDecoder and VideoDecoder Status enums
24 // match, break them into a decoder_status.h. 24 // match, break them into a decoder_status.h.
25 enum Status { 25 enum Status {
26 kOk, // Everything went as planned. 26 kOk, // Everything went as planned.
27 kAborted, // Decode was aborted as a result of Reset() being called. 27 kAborted, // Decode was aborted as a result of Reset() being called.
28 kDecodeError, // Decoding error happened. 28 kDecodeError, // Decoding error happened.
29 kDecryptError // Decrypting error happened. 29 kDecryptError // Decrypting error happened.
30 }; 30 };
31 31
32 // Callback to return decode frames. 32 // Callback for VideoDecoder to return a decoded frame whenever it becomes
33 // available. Only valid frames should be returned via this callback. EOS
34 // frames should not be returned via this callback.
Sergey Ulanov 2014/06/16 23:49:32 same here as in audio_decoder.h
xhwang 2014/06/17 18:56:35 Done.
33 typedef base::Callback<void(const scoped_refptr<VideoFrame>&)> OutputCB; 35 typedef base::Callback<void(const scoped_refptr<VideoFrame>&)> OutputCB;
34 36
35 // Callback type for Decode(). Called after the decoder has completed decoding 37 // Callback type for Decode(). Called after the decoder has completed decoding
36 // corresponding DecoderBuffer, indicating that it's ready to accept another 38 // corresponding DecoderBuffer, indicating that it's ready to accept another
37 // buffer to decode. 39 // buffer to decode.
38 typedef base::Callback<void(Status status)> DecodeCB; 40 typedef base::Callback<void(Status status)> DecodeCB;
39 41
40 VideoDecoder(); 42 VideoDecoder();
41 virtual ~VideoDecoder(); 43 virtual ~VideoDecoder();
42 44
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Returns maximum number of parallel decode requests. 103 // Returns maximum number of parallel decode requests.
102 virtual int GetMaxDecodeRequests() const; 104 virtual int GetMaxDecodeRequests() const;
103 105
104 private: 106 private:
105 DISALLOW_COPY_AND_ASSIGN(VideoDecoder); 107 DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
106 }; 108 };
107 109
108 } // namespace media 110 } // namespace media
109 111
110 #endif // MEDIA_BASE_VIDEO_DECODER_H_ 112 #endif // MEDIA_BASE_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698