diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-26 18:08:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-26 18:29:05 -0300 |
| commit | f858a6e27817930817303b8ffb367087d82f70be (patch) | |
| tree | 379d5e519be18f8f493fe99553b68b4c4529b37e /libavformat/rtmppkt.c | |
| parent | c83c164f05cba9e7cdb11c9dcd4fb87b90eb6c6d (diff) | |
| parent | a1a143adb0fd11c474221431417cff25db7d920f (diff) | |
Merge commit 'a1a143adb0fd11c474221431417cff25db7d920f'
* commit 'a1a143adb0fd11c474221431417cff25db7d920f':
rtmp: Rename packet types to closer match the spec
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/rtmppkt.c')
| -rw-r--r-- | libavformat/rtmppkt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 3ae605d280..1eeae17337 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -574,9 +574,9 @@ static const char* rtmp_packet_type(int type) switch (type) { case RTMP_PT_CHUNK_SIZE: return "chunk size"; case RTMP_PT_BYTES_READ: return "bytes read"; - case RTMP_PT_PING: return "ping"; - case RTMP_PT_SERVER_BW: return "server bandwidth"; - case RTMP_PT_CLIENT_BW: return "client bandwidth"; + case RTMP_PT_USER_CONTROL: return "user control"; + case RTMP_PT_WINDOW_ACK_SIZE: return "window acknowledgement size"; + case RTMP_PT_SET_PEER_BW: return "set peer bandwidth"; case RTMP_PT_AUDIO: return "audio packet"; case RTMP_PT_VIDEO: return "video packet"; case RTMP_PT_FLEX_STREAM: return "Flex shared stream"; @@ -674,10 +674,10 @@ void ff_rtmp_packet_dump(void *ctx, RTMPPacket *p) break; src += sz; } - } else if (p->type == RTMP_PT_SERVER_BW){ - av_log(ctx, AV_LOG_DEBUG, "Server BW = %d\n", AV_RB32(p->data)); - } else if (p->type == RTMP_PT_CLIENT_BW){ - av_log(ctx, AV_LOG_DEBUG, "Client BW = %d\n", AV_RB32(p->data)); + } else if (p->type == RTMP_PT_WINDOW_ACK_SIZE) { + av_log(ctx, AV_LOG_DEBUG, "Window acknowledgement size = %d\n", AV_RB32(p->data)); + } else if (p->type == RTMP_PT_SET_PEER_BW) { + av_log(ctx, AV_LOG_DEBUG, "Set Peer BW = %d\n", AV_RB32(p->data)); } else if (p->type != RTMP_PT_AUDIO && p->type != RTMP_PT_VIDEO && p->type != RTMP_PT_METADATA) { int i; for (i = 0; i < p->size; i++) |