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

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

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 4 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_selector.cc ('k') | media/filters/decrypting_audio_decoder.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.h" 5 #include "media/filters/decoder_stream.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 12 matching lines...) Expand all
23 #include "media/filters/decrypting_demuxer_stream.h" 23 #include "media/filters/decrypting_demuxer_stream.h"
24 24
25 namespace media { 25 namespace media {
26 26
27 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for 27 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for
28 // templated classes such as this. 28 // templated classes such as this.
29 template <DemuxerStream::Type StreamType> 29 template <DemuxerStream::Type StreamType>
30 static const char* GetTraceString(); 30 static const char* GetTraceString();
31 31
32 #define FUNCTION_DVLOG(level) \ 32 #define FUNCTION_DVLOG(level) \
33 DVLOG(level) << __FUNCTION__ << "<" << GetStreamTypeString() << ">" 33 DVLOG(level) << __func__ << "<" << GetStreamTypeString() << ">"
34 34
35 template <> 35 template <>
36 const char* GetTraceString<DemuxerStream::VIDEO>() { 36 const char* GetTraceString<DemuxerStream::VIDEO>() {
37 return "DecoderStream<VIDEO>::Decode"; 37 return "DecoderStream<VIDEO>::Decode";
38 } 38 }
39 39
40 template <> 40 template <>
41 const char* GetTraceString<DemuxerStream::AUDIO>() { 41 const char* GetTraceString<DemuxerStream::AUDIO>() {
42 return "DecoderStream<AUDIO>::Decode"; 42 return "DecoderStream<AUDIO>::Decode";
43 } 43 }
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 } 784 }
785 785
786 // The resetting process will be continued in OnDecoderReinitialized(). 786 // The resetting process will be continued in OnDecoderReinitialized().
787 ReinitializeDecoder(); 787 ReinitializeDecoder();
788 } 788 }
789 789
790 template class DecoderStream<DemuxerStream::VIDEO>; 790 template class DecoderStream<DemuxerStream::VIDEO>;
791 template class DecoderStream<DemuxerStream::AUDIO>; 791 template class DecoderStream<DemuxerStream::AUDIO>;
792 792
793 } // namespace media 793 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698