mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-07-05 19:08:09 +08:00
合并pr:#1025
This commit is contained in:
@@ -171,8 +171,7 @@ void RtmpPlayer::pause(bool bPause) {
|
||||
send_pause(bPause);
|
||||
}
|
||||
|
||||
void RtmpPlayer::speed(float speed)
|
||||
{
|
||||
void RtmpPlayer::speed(float speed) {
|
||||
//todo
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
|
||||
void play(const string &strUrl) override;
|
||||
void pause(bool bPause) override;
|
||||
void speed(float speed)override;
|
||||
void speed(float speed) override;
|
||||
void teardown() override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
}
|
||||
|
||||
void seekTo(uint32_t seekPos) override {
|
||||
uint32_t pos = MAX(float(0), MIN(seekPos, getDuration()))*1000;
|
||||
uint32_t pos = MAX(float(0), MIN(seekPos, getDuration())) * 1000;
|
||||
seekToMilliSecond(pos);
|
||||
}
|
||||
|
||||
|
||||
@@ -413,23 +413,18 @@ void RtmpSession::onCmd_pause(AMFDecoder &dec) {
|
||||
sendUserControl(paused ? CONTROL_STREAM_EOF : CONTROL_STREAM_BEGIN, STREAM_MEDIA);
|
||||
_paused = paused;
|
||||
|
||||
auto stongSrc = _player_src.lock();
|
||||
if (stongSrc) {
|
||||
if (_paused)
|
||||
stongSrc->pause();
|
||||
else
|
||||
stongSrc->seekTo(-1);
|
||||
auto strongSrc = _player_src.lock();
|
||||
if (strongSrc) {
|
||||
strongSrc->pause(paused);
|
||||
}
|
||||
}
|
||||
|
||||
void RtmpSession::onCmd_playCtrl(AMFDecoder& dec)
|
||||
{
|
||||
void RtmpSession::onCmd_playCtrl(AMFDecoder &dec) {
|
||||
dec.load<AMFValue>();
|
||||
auto ctrlObj = dec.load<AMFValue>();
|
||||
int ctrlType = ctrlObj["ctrlType"].as_integer();
|
||||
float speed = ctrlObj["speed"].as_number();
|
||||
|
||||
|
||||
AMFValue status(AMF_OBJECT);
|
||||
status.set("level", "status");
|
||||
status.set("code", "NetStream.Speed.Notify");
|
||||
|
||||
@@ -53,7 +53,7 @@ private:
|
||||
|
||||
void onCmd_seek(AMFDecoder &dec);
|
||||
void onCmd_pause(AMFDecoder &dec);
|
||||
void onCmd_playCtrl(AMFDecoder& dec);
|
||||
void onCmd_playCtrl(AMFDecoder &dec);
|
||||
void setMetaData(AMFDecoder &dec);
|
||||
|
||||
void onSendMedia(const RtmpPacket::Ptr &pkt);
|
||||
|
||||
Reference in New Issue
Block a user