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

Side by Side Diff: media/omx/omx_codec_unittest.cc

Issue 6628020: Cleaning up src/media to be consistent with static versus anonymous namespaces. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix namespaces Created 9 years, 9 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) 2010 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 #define _CRT_SECURE_NO_WARNINGS 5 #define _CRT_SECURE_NO_WARNINGS
6 6
7 #if 0 7 #if 0
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
(...skipping 11 matching lines...) Expand all
23 using ::testing::DoAll; 23 using ::testing::DoAll;
24 using ::testing::InSequence; 24 using ::testing::InSequence;
25 using ::testing::IsNull; 25 using ::testing::IsNull;
26 using ::testing::NotNull; 26 using ::testing::NotNull;
27 using ::testing::Return; 27 using ::testing::Return;
28 using ::testing::SaveArg; 28 using ::testing::SaveArg;
29 using ::testing::SetArgumentPointee; 29 using ::testing::SetArgumentPointee;
30 using ::testing::StrEq; 30 using ::testing::StrEq;
31 using ::testing::StrictMock; 31 using ::testing::StrictMock;
32 32
33 namespace { 33 namespace media {
34 34
35 const int kBufferCount = 3; 35 static const int kBufferCount = 3;
36 const int kBufferSize = 4096; 36 static const int kBufferSize = 4096;
37 const char* kComponentName = "OMX.google.video_decoder.avc"; 37 static const char* kComponentName = "OMX.google.video_decoder.avc";
38 38
39 } // namespace
40
41 namespace media {
42 ACTION(ReturnComponentName) { 39 ACTION(ReturnComponentName) {
43 strcpy(((char**)arg2)[0], kComponentName); 40 strcpy(((char**)arg2)[0], kComponentName);
44 } 41 }
45 42
46 ACTION(GetHandle) { 43 ACTION(GetHandle) {
47 *arg0 = MockOmx::get()->component(); 44 *arg0 = MockOmx::get()->component();
48 MockOmx::get()->component()->pApplicationPrivate = arg2; 45 MockOmx::get()->component()->pApplicationPrivate = arg2;
49 memcpy(MockOmx::get()->callbacks(), arg3, sizeof(OMX_CALLBACKTYPE)); 46 memcpy(MockOmx::get()->callbacks(), arg3, sizeof(OMX_CALLBACKTYPE));
50 } 47 }
51 48
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 omx_engine_->Stop(stop_task_.CreateTask()); 474 omx_engine_->Stop(stop_task_.CreateTask());
478 message_loop_.RunAllPending(); 475 message_loop_.RunAllPending();
479 } 476 }
480 477
481 // TODO(hclam): Add test case for dynamic port config. 478 // TODO(hclam): Add test case for dynamic port config.
482 // TODO(hclam): Create a more complicated test case so that read 479 // TODO(hclam): Create a more complicated test case so that read
483 // requests and reply from FillThisBuffer() arrives out of order. 480 // requests and reply from FillThisBuffer() arrives out of order.
484 481
485 } // namespace media 482 } // namespace media
486 #endif 483 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698