|
|
|
@ -40,9 +40,9 @@ from aiortc import (
|
|
|
|
|
MediaStreamTrack,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
#logging.basicConfig()
|
|
|
|
|
#logger = logging.getLogger(__name__)
|
|
|
|
|
from logger import logger
|
|
|
|
|
logging.basicConfig()
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
from logger import logger as mylogger
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class PlayerStreamTrack(MediaStreamTrack):
|
|
|
|
@ -83,7 +83,7 @@ class PlayerStreamTrack(MediaStreamTrack):
|
|
|
|
|
self._start = time.time()
|
|
|
|
|
self._timestamp = 0
|
|
|
|
|
self.timelist.append(self._start)
|
|
|
|
|
logger.info('video start:%f',self._start)
|
|
|
|
|
mylogger.info('video start:%f',self._start)
|
|
|
|
|
return self._timestamp, VIDEO_TIME_BASE
|
|
|
|
|
else: #audio
|
|
|
|
|
if hasattr(self, "_timestamp"):
|
|
|
|
@ -101,7 +101,7 @@ class PlayerStreamTrack(MediaStreamTrack):
|
|
|
|
|
self._start = time.time()
|
|
|
|
|
self._timestamp = 0
|
|
|
|
|
self.timelist.append(self._start)
|
|
|
|
|
logger.info('audio start:%f',self._start)
|
|
|
|
|
mylogger.info('audio start:%f',self._start)
|
|
|
|
|
return self._timestamp, AUDIO_TIME_BASE
|
|
|
|
|
|
|
|
|
|
async def recv(self) -> Union[Frame, Packet]:
|
|
|
|
@ -137,7 +137,7 @@ class PlayerStreamTrack(MediaStreamTrack):
|
|
|
|
|
self.framecount += 1
|
|
|
|
|
self.lasttime = time.perf_counter()
|
|
|
|
|
if self.framecount==100:
|
|
|
|
|
logger.info(f"------actual avg final fps:{self.framecount/self.totaltime:.4f}")
|
|
|
|
|
mylogger.info(f"------actual avg final fps:{self.framecount/self.totaltime:.4f}")
|
|
|
|
|
self.framecount = 0
|
|
|
|
|
self.totaltime=0
|
|
|
|
|
return frame
|
|
|
|
@ -224,4 +224,4 @@ class HumanPlayer:
|
|
|
|
|
self.__container = None
|
|
|
|
|
|
|
|
|
|
def __log_debug(self, msg: str, *args) -> None:
|
|
|
|
|
logger.debug(f"HumanPlayer {msg}", *args)
|
|
|
|
|
mylogger.debug(f"HumanPlayer {msg}", *args)
|
|
|
|
|