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

Side by Side Diff: media/mp4/mp4_stream_parser_unittest.cc

Issue 10910293: Add is_encrypted() in VideoDecoderConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 #include <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 return true; 53 return true;
54 } 54 }
55 55
56 void InitF(bool init_ok, base::TimeDelta duration) { 56 void InitF(bool init_ok, base::TimeDelta duration) {
57 DVLOG(1) << "InitF: ok=" << init_ok 57 DVLOG(1) << "InitF: ok=" << init_ok
58 << ", dur=" << duration.InMilliseconds(); 58 << ", dur=" << duration.InMilliseconds();
59 } 59 }
60 60
61 bool NewConfigF(const AudioDecoderConfig& ac, 61 bool NewConfigF(const AudioDecoderConfig& ac,
62 const VideoDecoderConfig& vc) { 62 const VideoDecoderConfig& vc,
63 bool is_audio_encrypted,
64 bool is_vedio_encrypted) {
63 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() 65 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig()
64 << ", video=" << vc.IsValidConfig(); 66 << ", video=" << vc.IsValidConfig();
65 configs_received_ = true; 67 configs_received_ = true;
66 return true; 68 return true;
67 } 69 }
68 70
69 bool NewBuffersF(const StreamParser::BufferQueue& bufs) { 71 bool NewBuffersF(const StreamParser::BufferQueue& bufs) {
70 DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers"; 72 DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers";
71 for (StreamParser::BufferQueue::const_iterator buf = bufs.begin(); 73 for (StreamParser::BufferQueue::const_iterator buf = bufs.begin();
72 buf != bufs.end(); buf++) { 74 buf != bufs.end(); buf++) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), 158 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
157 buffer->GetDataSize(), 159 buffer->GetDataSize(),
158 512)); 160 512));
159 } 161 }
160 162
161 // TODO(strobe): Create and test media which uses CENC auxiliary info stored 163 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
162 // inside a private box 164 // inside a private box
163 165
164 } // namespace mp4 166 } // namespace mp4
165 } // namespace media 167 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698