July 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r14047 - trunk/libavcodec/mlp_parser.c
by subversion＠mplayerhq.hu 02 Jul '08

02 Jul '08

Author: ramiro Date: Wed Jul 2 14:24:50 2008 New Revision: 14047 Log: Clarify comment about parity nibble. Modified: trunk/libavcodec/mlp_parser.c Modified: trunk/libavcodec/mlp_parser.c ============================================================================== --- trunk/libavcodec/mlp_parser.c (original) +++ trunk/libavcodec/mlp_parser.c Wed Jul 2 14:24:50 2008 @@ -238,7 +238,8 @@ static int mlp_parse(AVCodecParserContex sync_present = (AV_RB32(buf + 4) & 0xfffffffe) == 0xf8726fba; if (!sync_present) { - // First nibble of a frame is a parity check of the first few nibbles. + /* The first nibble of a frame is a parity check of the 4-byte + * access unit header and all the 2- or 4-byte substream headers. */ // Only check when this isn't a sync frame - syncs have a checksum. parity_bits = 0;

1 0

r14046 - trunk/libavformat/rtpdec.c
by subversion＠mplayerhq.hu 02 Jul '08

02 Jul '08

Author: lucabe Date: Wed Jul 2 12:26:23 2008 New Revision: 14046 Log: Reindent after last commit Modified: trunk/libavformat/rtpdec.c Modified: trunk/libavformat/rtpdec.c ============================================================================== --- trunk/libavformat/rtpdec.c (original) +++ trunk/libavformat/rtpdec.c Wed Jul 2 12:26:23 2008 @@ -365,16 +365,16 @@ static int rtp_parse_mp4_au(RTPDemuxCont */ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { - if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { - int64_t addend; + if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { + int64_t addend; + int delta_timestamp; - int delta_timestamp; - /* compute pts from timestamp with received ntp_time */ - delta_timestamp = timestamp - s->last_rtcp_timestamp; - /* convert to the PTS timebase */ - addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, (uint64_t)s->st->time_base.num << 32); - pkt->pts = addend + delta_timestamp; - } + /* compute pts from timestamp with received ntp_time */ + delta_timestamp = timestamp - s->last_rtcp_timestamp; + /* convert to the PTS timebase */ + addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, (uint64_t)s->st->time_base.num << 32); + pkt->pts = addend + delta_timestamp; + } pkt->stream_index = s->st->index; }

1 0

r14045 - trunk/libavformat/rtpdec.c
by subversion＠mplayerhq.hu 02 Jul '08

02 Jul '08

Author: lucabe Date: Wed Jul 2 12:23:27 2008 New Revision: 14045 Log: Fix A/V synch for RTP streams that do not contain MPEG1 or 2 (correctly compute the presentation times based on the RTP timestamps and the RTCP SR packets) Modified: trunk/libavformat/rtpdec.c Modified: trunk/libavformat/rtpdec.c ============================================================================== --- trunk/libavformat/rtpdec.c (original) +++ trunk/libavformat/rtpdec.c Wed Jul 2 12:23:27 2008 @@ -282,6 +282,7 @@ RTPDemuxContext *rtp_parse_open(AVFormat s->st = st; s->rtp_payload_data = rtp_payload_data; rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? + av_set_pts_info(s->st, 32, 1, 90000); if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { s->ts = mpegts_parse_open(s->ic); if (s->ts == NULL) { @@ -299,6 +300,9 @@ RTPDemuxContext *rtp_parse_open(AVFormat st->need_parsing = AVSTREAM_PARSE_FULL; break; default: + if (st->codec->codec_type == CODEC_TYPE_AUDIO) { + av_set_pts_info(st, 32, 1, st->codec->sample_rate); + } break; } } @@ -361,32 +365,16 @@ static int rtp_parse_mp4_au(RTPDemuxCont */ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { - switch(s->st->codec->codec_id) { - case CODEC_ID_MP2: - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { int64_t addend; int delta_timestamp; - /* XXX: is it really necessary to unify the timestamp base ? */ /* compute pts from timestamp with received ntp_time */ delta_timestamp = timestamp - s->last_rtcp_timestamp; - /* convert to 90 kHz without overflow */ - addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; - addend = (addend * 5625) >> 14; + /* convert to the PTS timebase */ + addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, (uint64_t)s->st->time_base.num << 32); pkt->pts = addend + delta_timestamp; } - break; - case CODEC_ID_AAC: - case CODEC_ID_H264: - case CODEC_ID_MPEG4: - pkt->pts = timestamp; - break; - default: - /* no timestamp info yet */ - break; - } pkt->stream_index = s->st->index; }

1 0

r14044 - in trunk/libavcodec: mlp_parser.c mlp_parser.h
by subversion＠mplayerhq.hu 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 03:36:16 2008 New Revision: 14044 Log: Make ff_mlp_read_major_sync() take a GetBitContext instead of buffers. Modified: trunk/libavcodec/mlp_parser.c trunk/libavcodec/mlp_parser.h Modified: trunk/libavcodec/mlp_parser.c ============================================================================== --- trunk/libavcodec/mlp_parser.c (original) +++ trunk/libavcodec/mlp_parser.c Tue Jul 1 03:36:16 2008 @@ -88,74 +88,73 @@ static uint16_t mlp_checksum16(const uin /** Read a major sync info header - contains high level information about * the stream - sample rate, channel arrangement etc. Most of this * information is not actually necessary for decoding, only for playback. + * gb must be a freshly initialized GetBitContext with no bits read. */ -int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, const uint8_t *buf, - unsigned int buf_size) +int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb) { - GetBitContext gb; int ratebits; uint16_t checksum; - if (buf_size < 28) { + assert(get_bits_count(gb) == 0); + + if (gb->size_in_bits < 28 << 3) { av_log(log, AV_LOG_ERROR, "Packet too short, unable to read major sync\n"); return -1; } - checksum = mlp_checksum16(buf, 26); - if (checksum != AV_RL16(buf+26)) { + checksum = mlp_checksum16(gb->buffer, 26); + if (checksum != AV_RL16(gb->buffer+26)) { av_log(log, AV_LOG_ERROR, "Major sync info header checksum error\n"); return -1; } - init_get_bits(&gb, buf, buf_size * 8); - - if (get_bits_long(&gb, 24) != 0xf8726f) /* Sync words */ + if (get_bits_long(gb, 24) != 0xf8726f) /* Sync words */ return -1; - mh->stream_type = get_bits(&gb, 8); + mh->stream_type = get_bits(gb, 8); if (mh->stream_type == 0xbb) { - mh->group1_bits = mlp_quants[get_bits(&gb, 4)]; - mh->group2_bits = mlp_quants[get_bits(&gb, 4)]; + mh->group1_bits = mlp_quants[get_bits(gb, 4)]; + mh->group2_bits = mlp_quants[get_bits(gb, 4)]; - ratebits = get_bits(&gb, 4); + ratebits = get_bits(gb, 4); mh->group1_samplerate = mlp_samplerate(ratebits); - mh->group2_samplerate = mlp_samplerate(get_bits(&gb, 4)); + mh->group2_samplerate = mlp_samplerate(get_bits(gb, 4)); - skip_bits(&gb, 11); + skip_bits(gb, 11); - mh->channels_mlp = get_bits(&gb, 5); + mh->channels_mlp = get_bits(gb, 5); } else if (mh->stream_type == 0xba) { mh->group1_bits = 24; // TODO: Is this information actually conveyed anywhere? mh->group2_bits = 0; - ratebits = get_bits(&gb, 4); + ratebits = get_bits(gb, 4); mh->group1_samplerate = mlp_samplerate(ratebits); mh->group2_samplerate = 0; - skip_bits(&gb, 8); + skip_bits(gb, 8); - mh->channels_thd_stream1 = get_bits(&gb, 5); + mh->channels_thd_stream1 = get_bits(gb, 5); - skip_bits(&gb, 2); + skip_bits(gb, 2); - mh->channels_thd_stream2 = get_bits(&gb, 13); + mh->channels_thd_stream2 = get_bits(gb, 13); } else return -1; mh->access_unit_size = 40 << (ratebits & 7); mh->access_unit_size_pow2 = 64 << (ratebits & 7); - skip_bits_long(&gb, 48); + skip_bits_long(gb, 48); - mh->is_vbr = get_bits1(&gb); + mh->is_vbr = get_bits1(gb); - mh->peak_bitrate = (get_bits(&gb, 15) * mh->group1_samplerate + 8) >> 4; + mh->peak_bitrate = (get_bits(gb, 15) * mh->group1_samplerate + 8) >> 4; - mh->num_substreams = get_bits(&gb, 4); + mh->num_substreams = get_bits(gb, 4); - skip_bits_long(&gb, 4 + 11 * 8); + skip_bits_long(gb, 4 + 11 * 8); return 0; } @@ -258,9 +257,11 @@ static int mlp_parse(AVCodecParserContex goto lost_sync; } } else { + GetBitContext gb; MLPHeaderInfo mh; - if (ff_mlp_read_major_sync(avctx, &mh, buf + 4, buf_size - 4) < 0) + init_get_bits(&gb, buf + 4, (buf_size - 4) << 3); + if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0) goto lost_sync; #ifdef CONFIG_AUDIO_NONSHORT Modified: trunk/libavcodec/mlp_parser.h ============================================================================== --- trunk/libavcodec/mlp_parser.h (original) +++ trunk/libavcodec/mlp_parser.h Tue Jul 1 03:36:16 2008 @@ -53,8 +53,7 @@ typedef struct MLPHeaderInfo } MLPHeaderInfo; -int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, const uint8_t *buf, - unsigned int buf_size); +int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb); #endif /* FFMPEG_MLP_PARSER_H */

1 0