oggdec: Set dts when known

[ffmpeg] / libavformat / rtmppkt.c

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 2eab1c13df79d65c570e885713de5ce4498a61d3..e243e56da514519778b64851beb1667e406b4dda 100644 (file)
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -155,7 +155,19 @@ int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
     int off = 0;
     pkt->ts_delta = pkt->timestamp - prev_pkt[pkt->channel_id].timestamp;
 
-    //TODO: header compression
+    //if channel_id = 0, this is first presentation of prev_pkt, send full hdr.
+    if (prev_pkt[pkt->channel_id].channel_id &&
+        pkt->extra == prev_pkt[pkt->channel_id].extra) {
+        if (pkt->type == prev_pkt[pkt->channel_id].type &&
+            pkt->data_size == prev_pkt[pkt->channel_id].data_size) {
+            mode = RTMP_PS_FOURBYTES;
+            if (pkt->ts_delta == prev_pkt[pkt->channel_id].ts_delta)
+                mode = RTMP_PS_ONEBYTE;
+        } else {
+            mode = RTMP_PS_EIGHTBYTES;
+        }
+    }
+
     if (pkt->channel_id < 64) {
         bytestream_put_byte(&p, pkt->channel_id | (mode << 6));
     } else if (pkt->channel_id < 64 + 256) {
@@ -179,6 +191,18 @@ int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
         if (timestamp >= 0xFFFFFF)
             bytestream_put_be32(&p, timestamp);
     }
+    // save history
+    prev_pkt[pkt->channel_id].channel_id = pkt->channel_id;
+    prev_pkt[pkt->channel_id].type       = pkt->type;
+    prev_pkt[pkt->channel_id].data_size  = pkt->data_size;
+    prev_pkt[pkt->channel_id].timestamp  = pkt->timestamp;
+    if (mode != RTMP_PS_TWELVEBYTES) {
+        prev_pkt[pkt->channel_id].ts_delta   = pkt->ts_delta;
+    } else {
+        prev_pkt[pkt->channel_id].ts_delta   = pkt->timestamp;
+    }
+    prev_pkt[pkt->channel_id].extra      = pkt->extra;
+
     url_write(h, pkt_hdr, p-pkt_hdr);
     while (off < pkt->data_size) {
         int towrite = FFMIN(chunk_size, pkt->data_size - off);
@@ -298,3 +322,112 @@ int ff_amf_get_field_value(const uint8_t *data, const uint8_t *data_end,
     }
     return -1;
 }
+
+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_AUDIO:          return "audio packet";
+    case RTMP_PT_VIDEO:          return "video packet";
+    case RTMP_PT_FLEX_STREAM:    return "Flex shared stream";
+    case RTMP_PT_FLEX_OBJECT:    return "Flex shared object";
+    case RTMP_PT_FLEX_MESSAGE:   return "Flex shared message";
+    case RTMP_PT_NOTIFY:         return "notification";
+    case RTMP_PT_SHARED_OBJ:     return "shared object";
+    case RTMP_PT_INVOKE:         return "invoke";
+    case RTMP_PT_METADATA:       return "metadata";
+    default:                     return "unknown";
+    }
+}
+
+static void ff_amf_tag_contents(void *ctx, const uint8_t *data, const uint8_t *data_end)
+{
+    int size;
+    char buf[1024];
+
+    if (data >= data_end)
+        return;
+    switch (*data++) {
+    case AMF_DATA_TYPE_NUMBER:
+        av_log(ctx, AV_LOG_DEBUG, " number %g\n", av_int2dbl(AV_RB64(data)));
+        return;
+    case AMF_DATA_TYPE_BOOL:
+        av_log(ctx, AV_LOG_DEBUG, " bool %d\n", *data);
+        return;
+    case AMF_DATA_TYPE_STRING:
+    case AMF_DATA_TYPE_LONG_STRING:
+        if (data[-1] == AMF_DATA_TYPE_STRING) {
+            size = bytestream_get_be16(&data);
+        } else {
+            size = bytestream_get_be32(data);
+        }
+        size = FFMIN(size, 1023);
+        memcpy(buf, data, size);
+        buf[size] = 0;
+        av_log(ctx, AV_LOG_DEBUG, " string '%s'\n", buf);
+        return;
+    case AMF_DATA_TYPE_NULL:
+        av_log(ctx, AV_LOG_DEBUG, " NULL\n");
+        return;
+    case AMF_DATA_TYPE_ARRAY:
+        data += 4;
+    case AMF_DATA_TYPE_OBJECT:
+        av_log(ctx, AV_LOG_DEBUG, " {\n");
+        for (;;) {
+            int size = bytestream_get_be16(&data);
+            int t;
+            memcpy(buf, data, size);
+            buf[size] = 0;
+            if (!size) {
+                av_log(ctx, AV_LOG_DEBUG, " }\n");
+                data++;
+                break;
+            }
+            if (data + size >= data_end || data + size < data)
+                return;
+            data += size;
+            av_log(ctx, AV_LOG_DEBUG, "  %s: ", buf);
+            ff_amf_tag_contents(ctx, data, data_end);
+            t = ff_amf_tag_size(data, data_end);
+            if (t < 0 || data + t >= data_end)
+                return;
+            data += t;
+        }
+        return;
+    case AMF_DATA_TYPE_OBJECT_END:
+        av_log(ctx, AV_LOG_DEBUG, " }\n");
+        return;
+    default:
+        return;
+    }
+}
+
+void ff_rtmp_packet_dump(void *ctx, RTMPPacket *p)
+{
+    av_log(ctx, AV_LOG_DEBUG, "RTMP packet type '%s'(%d) for channel %d, timestamp %d, extra field %d size %d\n",
+           rtmp_packet_type(p->type), p->type, p->channel_id, p->timestamp, p->extra, p->data_size);
+    if (p->type == RTMP_PT_INVOKE || p->type == RTMP_PT_NOTIFY) {
+        uint8_t *src = p->data, *src_end = p->data + p->data_size;
+        while (src < src_end) {
+            int sz;
+            ff_amf_tag_contents(ctx, src, src_end);
+            sz = ff_amf_tag_size(src, src_end);
+            if (sz < 0)
+                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_AUDIO && p->type != RTMP_PT_VIDEO && p->type != RTMP_PT_METADATA) {
+        int i;
+        for (i = 0; i < p->data_size; i++)
+            av_log(ctx, AV_LOG_DEBUG, " %02X", p->data[i]);
+        av_log(ctx, AV_LOG_DEBUG, "\n");
+    }
+}