July 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4562 - in rtmp: rtmppkt.c rtmppkt.h
by kostya 01 Jul '09

01 Jul '09

Author: kostya Date: Wed Jul 1 12:26:35 2009 New Revision: 4562 Log: Drop unneeded function for determining AMF tag size Modified: rtmp/rtmppkt.c rtmp/rtmppkt.h Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Wed Jul 1 12:10:51 2009 (r4561) +++ rtmp/rtmppkt.c Wed Jul 1 12:26:35 2009 (r4562) @@ -28,21 +28,6 @@ #include "rtmppkt.h" -static const int8_t amf_tag_sizes[17] = { - 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 4, 0, 0, 0, 0 -}; - -int rtmp_amf_tag_size(int type, const void *data) -{ - if (type == AMF_STRING_IN_OBJECT || type == AMF_STRING) - return strlen(data) + 2; - if (type > AMF_TYPED_OBJECT) - return -1; - if (type == AMF_LONG_STRING) - return strlen(data) + 4; - return amf_tag_sizes[type]; -} - void rtmp_amf_write_tag(uint8_t **dst, AMFType type, const void *data) { if (type != AMF_OBJECT_END && type != AMF_STRING_IN_OBJECT) Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Wed Jul 1 12:10:51 2009 (r4561) +++ rtmp/rtmppkt.h Wed Jul 1 12:26:35 2009 (r4562) @@ -103,8 +103,6 @@ int rtmp_packet_read(URLContext *h, RTMP int rtmp_packet_write(URLContext *h, RTMPPacket *p, int chunk_size, RTMPPacket *prev_pkt); -int rtmp_amf_tag_size(int type, const void *data); - int rtmp_amf_skip_data(const uint8_t *data); int rtmp_amf_find_field(const uint8_t *data, const uint8_t *name,

1 0

[soc]: r4561 - rtmp/rtmppkt.h
by kostya 01 Jul '09

01 Jul '09

Author: kostya Date: Wed Jul 1 12:10:51 2009 New Revision: 4561 Log: Throw out useless enum Modified: rtmp/rtmppkt.h Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Wed Jul 1 12:06:40 2009 (r4560) +++ rtmp/rtmppkt.h Wed Jul 1 12:10:51 2009 (r4561) @@ -51,20 +51,6 @@ typedef enum RTMPPacketType { RTMP_PT_METADATA = 22, ///< FLV metadata } RTMPPacketType; -typedef enum RTMPObjectType { - RTMP_OT_CONNECT, - RTMP_OT_DISCONNECT, - RTMP_OT_SET_ATTR, - RTMP_OT_UPDATE_DATA, - RTMP_OT_UPDATE_ATTR, - RTMP_OT_SEND_MSG, - RTMP_OT_STATUS, - RTMP_OT_CLEAR_DATA, - RTMP_OT_DELETE_DATA, - RTMP_OT_DELETE_ATTR, - RTMP_OT_INITIAL_DATA, -} RTMPObjectType; - enum RTMPPacketSize { RTMP_PS_TWELVEBYTES = 0, RTMP_PS_EIGHTBYTES,

1 0

[soc]: r4560 - rtmp/rtmppkt.h
by kostya 01 Jul '09

01 Jul '09

Author: kostya Date: Wed Jul 1 12:06:40 2009 New Revision: 4560 Log: cosmetics: add one space between declaration and comment Modified: rtmp/rtmppkt.h Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Wed Jul 1 10:38:58 2009 (r4559) +++ rtmp/rtmppkt.h Wed Jul 1 12:06:40 2009 (r4560) @@ -98,12 +98,12 @@ typedef enum AMFType { * structure for holding RTMP packets */ typedef struct RTMPPacket { - uint8_t channel_id;///< RTMP channel ID - RTMPPacketType type; ///< packet type - int timestamp; ///< packet timestamp - int extra; ///< additional data - uint8_t *data; ///< packet payload - int data_size; ///< packet payload size + uint8_t channel_id; ///< RTMP channel ID + RTMPPacketType type; ///< packet type + int timestamp; ///< packet timestamp + int extra; ///< additional data + uint8_t *data; ///< packet payload + int data_size; ///< packet payload size } RTMPPacket; int rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type,

1 0

[soc]: r4559 - rtmp/rtmppkt.c
by kostya 01 Jul '09

01 Jul '09

Author: kostya Date: Wed Jul 1 10:38:58 2009 New Revision: 4559 Log: cosmetics: vertical align after last commit Modified: rtmp/rtmppkt.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Wed Jul 1 10:37:36 2009 (r4558) +++ rtmp/rtmppkt.c Wed Jul 1 10:38:58 2009 (r4559) @@ -115,10 +115,10 @@ int rtmp_packet_read(URLContext *h, RTMP p->extra = extra; // save history prev_pkt[channel_id].channel_id = type; - prev_pkt[channel_id].type = channel_id; - prev_pkt[channel_id].data_size = data_size; - prev_pkt[channel_id].timestamp = timestamp; - prev_pkt[channel_id].extra = extra; + prev_pkt[channel_id].type = channel_id; + prev_pkt[channel_id].data_size = data_size; + prev_pkt[channel_id].timestamp = timestamp; + prev_pkt[channel_id].extra = extra; while (data_size > 0) { int toread = FFMIN(data_size, chunk_size); int r; @@ -176,11 +176,11 @@ int rtmp_packet_create(RTMPPacket *pkt, pkt->data = av_malloc(size); if (!pkt->data) return -1; - pkt->data_size = size; + pkt->data_size = size; pkt->channel_id = channel_id; - pkt->type = type; - pkt->timestamp = timestamp; - pkt->extra = 0; + pkt->type = type; + pkt->timestamp = timestamp; + pkt->extra = 0; return 0; }

1 0

[soc]: r4558 - in rtmp: rtmppkt.c rtmppkt.h rtmpproto.c
by kostya 01 Jul '09

01 Jul '09

Author: kostya Date: Wed Jul 1 10:37:36 2009 New Revision: 4558 Log: Rename stream_id to channel_id to avoid confusion with audio/video stream ID Modified: rtmp/rtmppkt.c rtmp/rtmppkt.h rtmp/rtmpproto.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Wed Jul 1 03:51:52 2009 (r4557) +++ rtmp/rtmppkt.c Wed Jul 1 10:37:36 2009 (r4558) @@ -72,13 +72,13 @@ int rtmp_packet_read(URLContext *h, RTMP int chunk_size, RTMPPacket *prev_pkt) { uint8_t hdr, t, buf[16]; - int stream_id, timestamp, data_size, offset = 0, extra = 0; + int channel_id, timestamp, data_size, offset = 0, extra = 0; uint8_t type; if (url_read(h, &hdr, 1) != 1) { return -1; } - stream_id = hdr & 0x3F; + channel_id = hdr & 0x3F; hdr >>= 6; if (hdr == RTMP_PS_ONEBYTE) { @@ -103,22 +103,22 @@ int rtmp_packet_read(URLContext *h, RTMP } extra = AV_RL32(buf); } else { - extra = prev_pkt[stream_id].extra; + extra = prev_pkt[channel_id].extra; } } else { - data_size = prev_pkt[stream_id].data_size; - type = prev_pkt[stream_id].type; - extra = prev_pkt[stream_id].extra; + data_size = prev_pkt[channel_id].data_size; + type = prev_pkt[channel_id].type; + extra = prev_pkt[channel_id].extra; } } - rtmp_packet_create(p, stream_id, type, timestamp, data_size); + rtmp_packet_create(p, channel_id, type, timestamp, data_size); p->extra = extra; // save history - prev_pkt[stream_id].stream_id = type; - prev_pkt[stream_id].type = stream_id; - prev_pkt[stream_id].data_size = data_size; - prev_pkt[stream_id].timestamp = timestamp; - prev_pkt[stream_id].extra = extra; + prev_pkt[channel_id].channel_id = type; + prev_pkt[channel_id].type = channel_id; + prev_pkt[channel_id].data_size = data_size; + prev_pkt[channel_id].timestamp = timestamp; + prev_pkt[channel_id].extra = extra; while (data_size > 0) { int toread = FFMIN(data_size, chunk_size); int r; @@ -130,7 +130,7 @@ int rtmp_packet_read(URLContext *h, RTMP offset += chunk_size; if (data_size > 0) { url_read_complete(h, &t, 1); //marker - if (t != (0xC0 + stream_id)) { + if (t != (0xC0 + channel_id)) { return -1; } } @@ -147,7 +147,7 @@ int rtmp_packet_write(URLContext *h, RTM // if (pkt->type != RTMP_PT_INVOKE) // mode = RTMP_PS_EIGHTBYTES; - bytestream_put_byte(&p, pkt->stream_id | (mode << 6)); + bytestream_put_byte(&p, pkt->channel_id | (mode << 6)); if (mode != RTMP_PS_ONEBYTE) { bytestream_put_be24(&p, pkt->timestamp); if (mode != RTMP_PS_FOURBYTES) { @@ -163,21 +163,21 @@ int rtmp_packet_write(URLContext *h, RTM url_write(h, pkt->data + off, towrite); off += towrite; if (off < pkt->data_size) { - uint8_t marker = 0xC0 | pkt->stream_id; + uint8_t marker = 0xC0 | pkt->channel_id; url_write(h, &marker, 1); } } return 0; } -int rtmp_packet_create(RTMPPacket *pkt, int stream_id, RTMPPacketType type, +int rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type, int timestamp, int size) { pkt->data = av_malloc(size); if (!pkt->data) return -1; pkt->data_size = size; - pkt->stream_id = stream_id; + pkt->channel_id = channel_id; pkt->type = type; pkt->timestamp = timestamp; pkt->extra = 0; @@ -322,12 +322,12 @@ static void parse_amf(const uint8_t *dat void rtmp_packet_inspect(RTMPPacket *pkt) { av_log(NULL,0,"Packet on "); - switch (pkt->stream_id) { + switch (pkt->channel_id) { case RTMP_NETWORK_CHANNEL: av_log(NULL,0,"network channel");break; case RTMP_SYSTEM_CHANNEL: av_log(NULL,0,"system channel");break; case RTMP_VIDEO_CHANNEL: av_log(NULL,0,"video channel");break; case RTMP_AUDIO_CHANNEL: av_log(NULL,0,"audio channel");break; - default: av_log(NULL,0,"channel %d",pkt->stream_id); + default: av_log(NULL,0,"channel %d",pkt->channel_id); } av_log(NULL,0," type "); switch (pkt->type) { Modified: rtmp/rtmppkt.h ============================================================================== --- rtmp/rtmppkt.h Wed Jul 1 03:51:52 2009 (r4557) +++ rtmp/rtmppkt.h Wed Jul 1 10:37:36 2009 (r4558) @@ -98,7 +98,7 @@ typedef enum AMFType { * structure for holding RTMP packets */ typedef struct RTMPPacket { - uint8_t stream_id; ///< stream ID + uint8_t channel_id;///< RTMP channel ID RTMPPacketType type; ///< packet type int timestamp; ///< packet timestamp int extra; ///< additional data @@ -106,7 +106,7 @@ typedef struct RTMPPacket { int data_size; ///< packet payload size } RTMPPacket; -int rtmp_packet_create(RTMPPacket *pkt, int stream_id, RTMPPacketType type, +int rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type, int timestamp, int size); void rtmp_packet_destroy(RTMPPacket *pkt); Modified: rtmp/rtmpproto.c ============================================================================== --- rtmp/rtmpproto.c Wed Jul 1 03:51:52 2009 (r4557) +++ rtmp/rtmpproto.c Wed Jul 1 10:37:36 2009 (r4558) @@ -55,7 +55,7 @@ typedef struct RTMPContext { int chunk_size; char playpath[256]; ClientState state; - int main_stream_id; + int main_channel_id; uint8_t* flv_data; int flv_size; int flv_off; @@ -160,7 +160,7 @@ static void gen_play(URLContext *s, RTMP //av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath); rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0, 29 + strlen(rt->playpath)); - pkt.extra = rt->main_stream_id; + pkt.extra = rt->main_channel_id; num = 0.0; p = pkt.data; @@ -381,7 +381,7 @@ static int rtmp_parse_result(URLContext if (pkt->data[10] || pkt->data[19] != 5 || pkt->data[20]) av_log(NULL, AV_LOG_WARNING, "Unexpected reply on connect()\n"); else - rt->main_stream_id = (int) av_int2dbl(AV_RB64(pkt->data + 21)); + rt->main_channel_id = (int) av_int2dbl(AV_RB64(pkt->data + 21)); gen_play(s, rt); rt->state = STATE_READY; break;

1 0

[soc]: r4557 - in concat/libavformat: playlist.c playlist.h
by gkovacs 01 Jul '09

01 Jul '09

Author: gkovacs Date: Wed Jul 1 03:51:52 2009 New Revision: 4557 Log: removing unused code Modified: concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Jul 1 03:45:05 2009 (r4556) +++ concat/libavformat/playlist.c Wed Jul 1 03:51:52 2009 (r4557) @@ -235,19 +235,6 @@ int ff_playlist_populate_context(Playlis return 0; } -/* -unsigned int ff_get_stream_offset(AVFormatContext *s) -{ - PlaylistD *playld; - int i; - unsigned int snum = 0; - playld = s->priv_data; - for (i = 0; i < playld->pe_curidxs[0]; ++i) - snum += playld->pelist[i]->ic->nb_streams; - return snum; -} -*/ - // converts duration to stream base int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration) { Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Wed Jul 1 03:45:05 2009 (r4556) +++ concat/libavformat/playlist.h Wed Jul 1 03:51:52 2009 (r4557) @@ -59,8 +59,6 @@ char* ff_buf_getline(ByteIOContext *s); void ff_split_wd_fn(char *filepath, char **workingdir, char **filename); -//unsigned int ff_get_stream_offset(AVFormatContext *s); - int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration); int64_t ff_get_duration(AVFormatContext *ic, int stream_index);

1 0

[soc]: r4555 - in concat/libavformat: m3u.c playlist.c
by gkovacs 01 Jul '09

01 Jul '09

Author: gkovacs Date: Wed Jul 1 03:25:57 2009 New Revision: 4555 Log: forcing intermediate double for ff_conv_stream_time to yield nonzero result Modified: concat/libavformat/m3u.c concat/libavformat/playlist.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Wed Jul 1 02:56:28 2009 (r4554) +++ concat/libavformat/m3u.c Wed Jul 1 03:25:57 2009 (r4555) @@ -116,23 +116,27 @@ static int m3u_read_packet(AVFormatConte } } // TODO switch from AVERROR_EOF to AVERROR_EOS - else if (ret == AVERROR_EOF && playld->pe_curidx < playld->pelist_size - 1) { + // -32 AVERROR_EOF for avi, -51 for ogg + else if (ret < 0 && playld->pe_curidx < playld->pelist_size - 1) { // TODO account for out-of-sync audio/video by using per-stream offsets // using streams[]->duration slightly overestimates offset // playld->dts_offset += ic->streams[0]->duration; // using streams[]->cur_dts slightly overestimates offset // playld->dts_offset += ic->streams[0]->cur_dts; // playld->dts_offset += playld->dts_prevpacket; + printf("switching streams\n"); for (i = 0; i < ic->nb_streams && i < playld->time_offsets_size; ++i) { playld->time_offsets[i] += ff_get_duration(ic, i); } -// playld->dts_offset += ff_get_duration(ic, pkt->stream_index); ++playld->pe_curidx; // pkt->destruct(pkt); pkt = av_malloc(sizeof(AVPacket)); ff_playlist_populate_context(playld, s); goto retr; } + else { + printf("avpacket ret is %d\n", ret); + } return ret; } Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Jul 1 02:56:28 2009 (r4554) +++ concat/libavformat/playlist.c Wed Jul 1 03:25:57 2009 (r4555) @@ -247,12 +247,12 @@ int64_t ff_conv_stream_time(AVFormatCont { int64_t durn; durn = (int64_t)( - avt_duration / - AV_TIME_BASE * - ic->streams[stream_index]->time_base.den / - ic->streams[stream_index]->time_base.num) - ; - printf("conv stream time from %ld to %ld/%ld is %ld\n", avt_duration, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, durn); + (double)avt_duration / //double casting may be unnecessary + ic->streams[stream_index]->time_base.num / + (AV_TIME_BASE / // 10^6 + ic->streams[stream_index]->time_base.den) + ); + printf("%s conv stream time from %ld to %ld/%ld is %ld\n", ic->iformat->name, avt_duration, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, durn); return durn; } @@ -271,8 +271,7 @@ int64_t ff_get_duration(AVFormatContext // h264 and mpeg1: pkt->dts values incorrect int64_t durn; durn = ic->duration; -// durn = (ic->duration / ic->streams[stream_index]->time_base.den) * -// (ic->streams[stream_index]->time_base.num / AV_TIME_BASE); +// durn = ic->streams[stream_index]->duration; // ogg gives wrong value printf("duration is %ld\n", durn); return durn; }

1 0

[soc]: r4554 - in concat/libavformat: m3u.c playlist.c playlist.h
by gkovacs 01 Jul '09

01 Jul '09

Author: gkovacs Date: Wed Jul 1 02:56:28 2009 New Revision: 4554 Log: fix timestamp issues with streams of different time bases Modified: concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Tue Jun 30 21:28:59 2009 (r4553) +++ concat/libavformat/m3u.c Wed Jul 1 02:56:28 2009 (r4554) @@ -102,6 +102,7 @@ static int m3u_read_header(AVFormatConte static int m3u_read_packet(AVFormatContext *s, AVPacket *pkt) { + int i; int ret; PlaylistD *playld; AVFormatContext *ic; @@ -110,18 +111,8 @@ static int m3u_read_packet(AVFormatConte ic = playld->pelist[playld->pe_curidx]->ic; ret = ic->iformat->read_packet(ic, pkt); if (ret >= 0) { - // TODO storing previous packet pts/dts is ugly hack - // ic->stream[]->cur_dts correct - // ic->strea[]->duration correct - // pkt->pts incorrect (huge negative) - // pkt->dts correct, depended on by ffmpeg (need to change) - // ic->stream[]->pts incorrect (0) - // ic->start_time always 0 - // changing ic->start_time has no effect - // ic->duration correct, divide by AV_TIME_BASE to get seconds if (pkt) { - playld->dts_prevpacket = pkt->dts; - pkt->dts += playld->dts_offset; + pkt->dts += ff_conv_stream_time(ic, pkt->stream_index, playld->time_offsets[pkt->stream_index]); } } // TODO switch from AVERROR_EOF to AVERROR_EOS @@ -131,7 +122,11 @@ static int m3u_read_packet(AVFormatConte // playld->dts_offset += ic->streams[0]->duration; // using streams[]->cur_dts slightly overestimates offset // playld->dts_offset += ic->streams[0]->cur_dts; - playld->dts_offset += playld->dts_prevpacket; +// playld->dts_offset += playld->dts_prevpacket; + for (i = 0; i < ic->nb_streams && i < playld->time_offsets_size; ++i) { + playld->time_offsets[i] += ff_get_duration(ic, i); + } +// playld->dts_offset += ff_get_duration(ic, pkt->stream_index); ++playld->pe_curidx; // pkt->destruct(pkt); pkt = av_malloc(sizeof(AVPacket)); Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Tue Jun 30 21:28:59 2009 (r4553) +++ concat/libavformat/playlist.c Wed Jul 1 02:56:28 2009 (r4554) @@ -79,11 +79,12 @@ PlayElem* ff_make_playelem(char *filenam PlaylistD* ff_make_playlistd(char *filename) { + int i; PlaylistD *playld = av_malloc(sizeof(PlaylistD)); -// playld->pts_offset = 0; - playld->dts_offset = 0; -// playld->pts_prevpacket = 0; - playld->dts_prevpacket = 0; + playld->time_offsets_size = 2; // TODO don't assume we have just 2 streams + playld->time_offsets = av_malloc(sizeof(playld->time_offsets) * playld->time_offsets_size); + for (i = 0; i < playld->time_offsets_size; ++i) + playld->time_offsets[i] = 0; playld->pe_curidx = 0; ff_split_wd_fn(filename, &playld->workingdir, @@ -241,3 +242,38 @@ unsigned int ff_get_stream_offset(AVForm return snum; } +// converts duration to stream base +int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration) +{ + int64_t durn; + durn = (int64_t)( + avt_duration / + AV_TIME_BASE * + ic->streams[stream_index]->time_base.den / + ic->streams[stream_index]->time_base.num) + ; + printf("conv stream time from %ld to %ld/%ld is %ld\n", avt_duration, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, durn); + return durn; +} + +// returns duration in seconds * AV_TIME_BASE +int64_t ff_get_duration(AVFormatContext *ic, int stream_index) +{ +// TODO storing previous packet pts/dts is ugly hack +// ic->stream[]->cur_dts correct +// ic->strea[]->duration correct +// pkt->pts incorrect (huge negative) +// pkt->dts correct, depended on by ffmpeg (need to change) +// ic->stream[]->pts incorrect (0) +// ic->start_time always 0 +// changing ic->start_time has no effect +// ic->duration correct, divide by AV_TIME_BASE to get seconds +// h264 and mpeg1: pkt->dts values incorrect + int64_t durn; + durn = ic->duration; +// durn = (ic->duration / ic->streams[stream_index]->time_base.den) * +// (ic->streams[stream_index]->time_base.num / AV_TIME_BASE); + printf("duration is %ld\n", durn); + return durn; +} + Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Tue Jun 30 21:28:59 2009 (r4553) +++ concat/libavformat/playlist.h Wed Jul 1 02:56:28 2009 (r4554) @@ -41,10 +41,12 @@ typedef struct PlaylistD { int ch_curidx; char *workingdir; char *filename; + int64_t *time_offsets; + int time_offsets_size; // int64_t pts_offset; - int64_t dts_offset; +// int64_t dts_offset; // int64_t pts_prevpacket; - int64_t dts_prevpacket; +// int64_t dts_prevpacket; } PlaylistD; PlayElem* ff_make_playelem(char *filename); @@ -60,3 +62,7 @@ char* ff_buf_getline(ByteIOContext *s); void ff_split_wd_fn(char *filepath, char **workingdir, char **filename); unsigned int ff_get_stream_offset(AVFormatContext *s); + +int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration); + +int64_t ff_get_duration(AVFormatContext *ic, int stream_index);

1 0