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

Side by Side Diff: media/filters/decoder_stream_traits.cc

Issue 2079923002: Combine bytes-decoded notification with memory usage and frame count. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 4 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
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | media/filters/video_frame_stream_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/filters/decoder_stream_traits.h" 5 #include "media/filters/decoder_stream_traits.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/audio_buffer.h" 8 #include "media/base/audio_buffer.h"
9 #include "media/base/audio_decoder.h" 9 #include "media/base/audio_decoder.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 16 matching lines...) Expand all
27 DCHECK(stream->audio_decoder_config().IsValidConfig()); 27 DCHECK(stream->audio_decoder_config().IsValidConfig());
28 decoder->Initialize(stream->audio_decoder_config(), cdm_context, init_cb, 28 decoder->Initialize(stream->audio_decoder_config(), cdm_context, init_cb,
29 output_cb); 29 output_cb);
30 } 30 }
31 31
32 bool DecoderStreamTraits<DemuxerStream::AUDIO>::NeedsBitstreamConversion( 32 bool DecoderStreamTraits<DemuxerStream::AUDIO>::NeedsBitstreamConversion(
33 DecoderType* decoder) { 33 DecoderType* decoder) {
34 return decoder->NeedsBitstreamConversion(); 34 return decoder->NeedsBitstreamConversion();
35 } 35 }
36 36
37 void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
38 const StatisticsCB& statistics_cb,
39 int bytes_decoded) {
40 PipelineStatistics statistics;
41 statistics.audio_bytes_decoded = bytes_decoded;
42 statistics_cb.Run(statistics);
43 }
44
45 scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType> 37 scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType>
46 DecoderStreamTraits<DemuxerStream::AUDIO>::CreateEOSOutput() { 38 DecoderStreamTraits<DemuxerStream::AUDIO>::CreateEOSOutput() {
47 return OutputType::CreateEOSBuffer(); 39 return OutputType::CreateEOSBuffer();
48 } 40 }
49 41
50 std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() { 42 std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() {
51 return "video"; 43 return "video";
52 } 44 }
53 45
54 void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder( 46 void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder(
55 DecoderType* decoder, 47 DecoderType* decoder,
56 DemuxerStream* stream, 48 DemuxerStream* stream,
57 CdmContext* cdm_context, 49 CdmContext* cdm_context,
58 const InitCB& init_cb, 50 const InitCB& init_cb,
59 const OutputCB& output_cb) { 51 const OutputCB& output_cb) {
60 DCHECK(stream->video_decoder_config().IsValidConfig()); 52 DCHECK(stream->video_decoder_config().IsValidConfig());
61 decoder->Initialize(stream->video_decoder_config(), 53 decoder->Initialize(stream->video_decoder_config(),
62 stream->liveness() == DemuxerStream::LIVENESS_LIVE, 54 stream->liveness() == DemuxerStream::LIVENESS_LIVE,
63 cdm_context, init_cb, output_cb); 55 cdm_context, init_cb, output_cb);
64 } 56 }
65 57
66 bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion( 58 bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
67 DecoderType* decoder) { 59 DecoderType* decoder) {
68 return decoder->NeedsBitstreamConversion(); 60 return decoder->NeedsBitstreamConversion();
69 } 61 }
70 62
71 void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(
72 const StatisticsCB& statistics_cb,
73 int bytes_decoded) {
74 PipelineStatistics statistics;
75 statistics.video_bytes_decoded = bytes_decoded;
76 statistics_cb.Run(statistics);
77 }
78
79 scoped_refptr<DecoderStreamTraits<DemuxerStream::VIDEO>::OutputType> 63 scoped_refptr<DecoderStreamTraits<DemuxerStream::VIDEO>::OutputType>
80 DecoderStreamTraits<DemuxerStream::VIDEO>::CreateEOSOutput() { 64 DecoderStreamTraits<DemuxerStream::VIDEO>::CreateEOSOutput() {
81 return OutputType::CreateEOSFrame(); 65 return OutputType::CreateEOSFrame();
82 } 66 }
83 67
84 } // namespace media 68 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698