提交 07820b6c 编写于 作者: X XUXIAOBO 提交者: Gitee

头文件刷新

Signed-off-by: NXUXIAOBO <xuxiaobo5@huawei.com>
上级 e217e836
...@@ -45,7 +45,6 @@ public: ...@@ -45,7 +45,6 @@ public:
MEDIA_DEBUG_LOG("ActsPlayerFuncTest::TearDown:%s", testInfo->name()); MEDIA_DEBUG_LOG("ActsPlayerFuncTest::TearDown:%s", testInfo->name());
}; };
static void LocalPlayFunc(const std::string uri, bool isAsync, WindowConfig config = g_sub_config); static void LocalPlayFunc(const std::string uri, bool isAsync, WindowConfig config = g_sub_config);
static void *LocalMulitPlayFunc(void *threadarg);
}; };
} }
} }
......
...@@ -37,7 +37,7 @@ namespace { ...@@ -37,7 +37,7 @@ namespace {
namespace TestPlayerBasic { namespace TestPlayerBasic {
class TestParamsConfig { class TestParamsConfig {
public: public:
static TestParamsConfig& GetInstance() static TestParamsConfig &GetInstance()
{ {
static TestParamsConfig config; static TestParamsConfig config;
return config; return config;
......
...@@ -67,8 +67,8 @@ public: ...@@ -67,8 +67,8 @@ public:
}; };
class TestPlayer { class TestPlayer {
public: public:
std::shared_ptr<Player> player_; std::shared_ptr<Player> player_ = nullptr;
sptr<Window> window_; sptr<Window> window_ = nullptr;
explicit TestPlayer(std::shared_ptr<PlayerSignal> test); explicit TestPlayer(std::shared_ptr<PlayerSignal> test);
virtual ~TestPlayer(); virtual ~TestPlayer();
bool CreatePlayer(); bool CreatePlayer();
...@@ -107,11 +107,12 @@ public: ...@@ -107,11 +107,12 @@ public:
void OnInfo(PlayerOnInfoType type, int32_t extra, const Format &infoBody = {}); void OnInfo(PlayerOnInfoType type, int32_t extra, const Format &infoBody = {});
int WaitForState(PlayerStates state); int WaitForState(PlayerStates state);
private: private:
void PrintState(PlayerStates state);
PlayerErrorType errorType_ = PLAYER_ERROR_UNKNOWN; PlayerErrorType errorType_ = PLAYER_ERROR_UNKNOWN;
int32_t errorCode_ = -1; int32_t errorCode_ = -1;
bool seekDoneFlag_ = false; bool seekDoneFlag_ = false;
int32_t postion_ = 0; int32_t postion_ = 0;
void PrintState(PlayerStates state);
std::shared_ptr<PlayerSignal> test_; std::shared_ptr<PlayerSignal> test_;
}; };
} }
......
...@@ -12,24 +12,3 @@ ...@@ -12,24 +12,3 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "gtest/gtest.h"
#include "player.h"
namespace PlayerNameSpace {
static std::string MOUNT_147 = "/data/media/audio/147";
static std::string MOUNT_189 = "/data/media/audio/189";
static const int MAX_THREADS = 16;
static const int32_t PLAYING_TIME = 3;
static const int32_t PAUSED_TIME = 1;
static const int32_t SEEK_TIME_5_SEC = 5000;
static const int32_t SEEK_TIME_2_SEC = 2000;
static const int DELTA_TIME = 1000;
static const int WAITSECOND = 2;
static const int MAXTIME = 1000;
static const int RET_OK = 0;
static const int32_t FILE_BEGIN = 0;
static const int32_t BUF_SIZE = 1024 * 1024;
static const OHOS::Media::PlayerSeekMode SEEK_MODE = OHOS::Media::PlayerSeekMode::SEEK_PREVIOUS_SYNC;
std::string GetUri();
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册