From f5c7f4328c086bbe6f8815797e5fcb6d72f74b37 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 1 Mar 2018 11:49:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Rtmp/RtmpMediaSource.cpp | 37 ------------------------------- src/Rtmp/RtmpPlayerImp.cpp | 42 ------------------------------------ src/Rtmp/RtmpPlayerImp.h | 7 ++++-- src/Rtsp/RtspMediaSource.cpp | 36 ------------------------------- src/Rtsp/RtspPlayerImp.cpp | 42 ------------------------------------ src/Rtsp/RtspPlayerImp.h | 7 ++++-- 6 files changed, 10 insertions(+), 161 deletions(-) delete mode 100644 src/Rtmp/RtmpMediaSource.cpp delete mode 100644 src/Rtmp/RtmpPlayerImp.cpp delete mode 100644 src/Rtsp/RtspMediaSource.cpp delete mode 100644 src/Rtsp/RtspPlayerImp.cpp diff --git a/src/Rtmp/RtmpMediaSource.cpp b/src/Rtmp/RtmpMediaSource.cpp deleted file mode 100644 index 261e4cf6..00000000 --- a/src/Rtmp/RtmpMediaSource.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2016 xiongziliang <771730766@qq.com> - * - * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "RtmpMediaSource.h" -#include "MediaFile/MediaReader.h" - -using namespace ZL::MediaFile; - -namespace ZL { -namespace Rtmp { - - -} /* namespace Rtmp */ -} /* namespace ZL */ diff --git a/src/Rtmp/RtmpPlayerImp.cpp b/src/Rtmp/RtmpPlayerImp.cpp deleted file mode 100644 index 05abd2ab..00000000 --- a/src/Rtmp/RtmpPlayerImp.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2016 xiongziliang <771730766@qq.com> - * - * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "RtmpPlayerImp.h" - -namespace ZL { -namespace Rtmp { - -RtmpPlayerImp::RtmpPlayerImp() { - -} - -RtmpPlayerImp::~RtmpPlayerImp() { - DebugL< { public: typedef std::shared_ptr Ptr; - RtmpPlayerImp(); - virtual ~RtmpPlayerImp(); + RtmpPlayerImp(){}; + virtual ~RtmpPlayerImp(){ + DebugL< 0){ return getProgressTime() / getDuration(); diff --git a/src/Rtsp/RtspMediaSource.cpp b/src/Rtsp/RtspMediaSource.cpp deleted file mode 100644 index 0e6f7d67..00000000 --- a/src/Rtsp/RtspMediaSource.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2016 xiongziliang <771730766@qq.com> - * - * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "RtspMediaSource.h" -#include "MediaFile/MediaReader.h" - -using namespace ZL::MediaFile; - -namespace ZL { -namespace Rtsp { - -} /* namespace Rtsp */ -} /* namespace ZL */ diff --git a/src/Rtsp/RtspPlayerImp.cpp b/src/Rtsp/RtspPlayerImp.cpp deleted file mode 100644 index 00542556..00000000 --- a/src/Rtsp/RtspPlayerImp.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2016 xiongziliang <771730766@qq.com> - * - * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "RtspPlayerImp.h" - -namespace ZL { - namespace Rtsp { - - RtspPlayerImp::RtspPlayerImp() { - } - - RtspPlayerImp::~RtspPlayerImp() { - DebugL< { public: typedef std::shared_ptr Ptr; - RtspPlayerImp(); - virtual ~RtspPlayerImp(); + RtspPlayerImp(){}; + virtual ~RtspPlayerImp(){ + DebugL< 0){ return getProgressTime() / getDuration();