January 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r7399 - trunk/libavformat/flvenc.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: banan Date: Mon Jan 1 23:52:22 2007 New Revision: 7399 Modified: trunk/libavformat/flvenc.c Log: VP6 and flashsv stream copy and muxing support. Modified: trunk/libavformat/flvenc.c ============================================================================== --- trunk/libavformat/flvenc.c (original) +++ trunk/libavformat/flvenc.c Mon Jan 1 23:52:22 2007 @@ -29,6 +29,7 @@ {CODEC_ID_FLV1, FLV_CODECID_H263 }, {CODEC_ID_FLASHSV, FLV_CODECID_SCREEN}, {CODEC_ID_VP6F, FLV_CODECID_VP6 }, + {CODEC_ID_VP6, FLV_CODECID_VP6 }, {CODEC_ID_NONE, 0} }; @@ -280,7 +281,13 @@ if (enc->codec_type == CODEC_TYPE_VIDEO) { put_byte(pb, FLV_TAG_TYPE_VIDEO); - flags = FLV_CODECID_H263; + + flags = codec_get_tag(flv_video_codec_ids, enc->codec_id); + if(flags == 0) { + av_log(enc, AV_LOG_ERROR, "video codec %X not compatible with flv\n",enc->codec_id); + return -1; + } + flags |= pkt->flags & PKT_FLAG_KEY ? FLV_FRAME_KEY : FLV_FRAME_INTER; } else { assert(enc->codec_type == CODEC_TYPE_AUDIO); @@ -291,10 +298,17 @@ put_byte(pb, FLV_TAG_TYPE_AUDIO); } - put_be24(pb,size+1); // include flags + if ((enc->codec_id == CODEC_ID_VP6) || (enc->codec_id == CODEC_ID_VP6F)) + put_be24(pb,size+2); // include the extra byte needed for VP6 in flv and flags + else + put_be24(pb,size+1); // include flags put_be24(pb,pkt->pts); put_be32(pb,flv->reserved); put_byte(pb,flags); + if (enc->codec_id == CODEC_ID_VP6) + put_byte(pb,0); + if (enc->codec_id == CODEC_ID_VP6F) + put_byte(pb, enc->extradata_size ? enc->extradata[0] : 0); put_buffer(pb, pkt->data, size); put_be32(pb,size+1+11); // previous tag size flv->duration = pkt->pts + pkt->duration;

1 0

r7398 - trunk/tests/libav.regression.ref
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: banan Date: Mon Jan 1 23:50:46 2007 New Revision: 7398 Modified: trunk/tests/libav.regression.ref Log: Correct value for the test. Modified: trunk/tests/libav.regression.ref ============================================================================== --- trunk/tests/libav.regression.ref (original) +++ trunk/tests/libav.regression.ref Mon Jan 1 23:50:46 2007 @@ -19,8 +19,8 @@ 87a8c8be5db2513356b28f29dff5769e *./data/b-libav.ffm 380928 ./data/b-libav.ffm ./data/b-libav.ffm CRC=0x01522b4a -5e8aa303a877cfac6569ed11cf20e92b *./data/b-libav.flv -335810 ./data/b-libav.flv +f8ad5bd78f4d012a8ce9570aa395ac54 *./data/b-libav.flv +335833 ./data/b-libav.flv ./data/b-libav.flv CRC=0xe14e8847 16518706f425cb537362bfc1c58b8de5 *./data/b-libav.mov 366923 ./data/b-libav.mov

1 0

r7397 - trunk/libavformat/avio.h
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: michael Date: Mon Jan 1 22:53:15 2007 New Revision: 7397 Modified: trunk/libavformat/avio.h Log: AVSEEK_SIZE doxy Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h (original) +++ trunk/libavformat/avio.h Mon Jan 1 22:53:15 2007 @@ -69,6 +69,11 @@ /* not implemented */ int url_poll(URLPollEntry *poll_table, int n, int timeout); +/** + * passing this as the "whence" parameter to a seek function causes it to + * return the filesize without seeking anywhere, supporting this is optional + * if its not supprted then the seek function will return <0 + */ #define AVSEEK_SIZE 0x10000 typedef struct URLProtocol {

1 0

r7396 - in trunk/libavformat: avio.c aviobuf.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: michael Date: Mon Jan 1 22:49:50 2007 New Revision: 7396 Modified: trunk/libavformat/avio.c trunk/libavformat/aviobuf.c Log: fix indention of previous commit Modified: trunk/libavformat/avio.c ============================================================================== --- trunk/libavformat/avio.c (original) +++ trunk/libavformat/avio.c Mon Jan 1 22:49:50 2007 @@ -150,9 +150,9 @@ size= url_seek(h, 0, AVSEEK_SIZE); if(size<0){ - pos = url_seek(h, 0, SEEK_CUR); - size = url_seek(h, -1, SEEK_END)+1; - url_seek(h, pos, SEEK_SET); + pos = url_seek(h, 0, SEEK_CUR); + size = url_seek(h, -1, SEEK_END)+1; + url_seek(h, pos, SEEK_SET); } return size; } Modified: trunk/libavformat/aviobuf.c ============================================================================== --- trunk/libavformat/aviobuf.c (original) +++ trunk/libavformat/aviobuf.c Mon Jan 1 22:49:50 2007 @@ -172,8 +172,8 @@ return -EPIPE; size = s->seek(s->opaque, 0, AVSEEK_SIZE); if(size<0){ - size = s->seek(s->opaque, -1, SEEK_END) + 1; - s->seek(s->opaque, s->pos, SEEK_SET); + size = s->seek(s->opaque, -1, SEEK_END) + 1; + s->seek(s->opaque, s->pos, SEEK_SET); } return size; }

1 0

r7395 - in trunk/libavformat: avio.c avio.h aviobuf.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: michael Date: Mon Jan 1 22:49:09 2007 New Revision: 7395 Modified: trunk/libavformat/avio.c trunk/libavformat/avio.h trunk/libavformat/aviobuf.c Log: seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility Modified: trunk/libavformat/avio.c ============================================================================== --- trunk/libavformat/avio.c (original) +++ trunk/libavformat/avio.c Mon Jan 1 22:49:09 2007 @@ -148,9 +148,12 @@ { offset_t pos, size; + size= url_seek(h, 0, AVSEEK_SIZE); + if(size<0){ pos = url_seek(h, 0, SEEK_CUR); size = url_seek(h, -1, SEEK_END)+1; url_seek(h, pos, SEEK_SET); + } return size; } Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h (original) +++ trunk/libavformat/avio.h Mon Jan 1 22:49:09 2007 @@ -69,6 +69,8 @@ /* not implemented */ int url_poll(URLPollEntry *poll_table, int n, int timeout); +#define AVSEEK_SIZE 0x10000 + typedef struct URLProtocol { const char *name; int (*url_open)(URLContext *h, const char *filename, int flags); Modified: trunk/libavformat/aviobuf.c ============================================================================== --- trunk/libavformat/aviobuf.c (original) +++ trunk/libavformat/aviobuf.c Mon Jan 1 22:49:09 2007 @@ -170,8 +170,11 @@ if (!s->seek) return -EPIPE; + size = s->seek(s->opaque, 0, AVSEEK_SIZE); + if(size<0){ size = s->seek(s->opaque, -1, SEEK_END) + 1; s->seek(s->opaque, s->pos, SEEK_SET); + } return size; }

1 0

r7394 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: michael Date: Mon Jan 1 22:17:14 2007 New Revision: 7394 Modified: trunk/libavformat/utils.c Log: revert regression test breaking change Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Mon Jan 1 22:17:14 2007 @@ -1960,7 +1960,7 @@ if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample) st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); - if(duration_count[i]>1 + if(1 && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) /*&& //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ... st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){

1 0

r7392 - trunk/libavformat/mpc.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: kostya Date: Mon Jan 1 06:29:53 2007 New Revision: 7392 Modified: trunk/libavformat/mpc.c Log: Make MPC demuxer deal with ID3 tags at the beginning Modified: trunk/libavformat/mpc.c ============================================================================== --- trunk/libavformat/mpc.c (original) +++ trunk/libavformat/mpc.c Mon Jan 1 06:29:53 2007 @@ -45,6 +45,8 @@ return 0; if (d[0] == 'M' && d[1] == 'P' && d[2] == '+' && (d[3] == 0x17 || d[3] == 0x7)) return AVPROBE_SCORE_MAX; + if (d[0] == 'I' && d[1] == 'D' && d[2] == '3') + return AVPROBE_SCORE_MAX / 2; return 0; } @@ -52,10 +54,26 @@ { MPCContext *c = s->priv_data; AVStream *st; + int t; - if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){ - av_log(s, AV_LOG_ERROR, "Not a Musepack file\n"); - return -1; + t = get_le24(&s->pb); + if(t != MKTAG('M', 'P', '+', 0)){ + if(t != MKTAG('I', 'D', '3', 0)){ + av_log(s, AV_LOG_ERROR, "Not a Musepack file\n"); + return -1; + } + /* skip ID3 tags and try again */ + url_fskip(&s->pb, 3); + t = get_byte(&s->pb) << 21; + t |= get_byte(&s->pb) << 14; + t |= get_byte(&s->pb) << 7; + t |= get_byte(&s->pb); + av_log(s, AV_LOG_DEBUG, "Skipping %d(%X) bytes of ID3 data\n", t, t); + url_fskip(&s->pb, t); + if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){ + av_log(s, AV_LOG_ERROR, "Not a Musepack file\n"); + return -1; + } } c->ver = get_byte(&s->pb); if(c->ver != 0x07 && c->ver != 0x17){

3 3

r7393 - in trunk: libavcodec/mpc.c libavformat/mpc.c
by subversion＠mplayerhq.hu 01 Jan '07

01 Jan '07

Author: kostya Date: Mon Jan 1 06:32:27 2007 New Revision: 7393 Modified: trunk/libavcodec/mpc.c trunk/libavformat/mpc.c Log: Decode previous 32 frames to avoid seeking artifacts in MPC Modified: trunk/libavcodec/mpc.c ============================================================================== --- trunk/libavcodec/mpc.c (original) +++ trunk/libavcodec/mpc.c Mon Jan 1 06:32:27 2007 @@ -51,6 +51,7 @@ int lastframelen, bands; int oldDSCF[2][BANDS]; int rnd; + int frames_to_skip; /* for synthesis */ DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]); int synth_buf_offset[MPA_MAX_CHANNELS]; @@ -98,6 +99,7 @@ c->lastframelen = get_bits(&gb, 11); av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n", c->IS, c->MSS, c->gapless, c->lastframelen, c->bands); + c->frames_to_skip = 0; if(vlc_inited) return 0; av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n"); @@ -328,11 +330,23 @@ av_log(NULL,0, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail); return -1; } + if(c->frames_to_skip){ + c->frames_to_skip--; + *data_size = 0; + return buf_size; + } *data_size = (buf[1] ? c->lastframelen : MPC_FRAME_SIZE) * 4; return buf_size; } +static void mpc7_decode_flush(AVCodecContext *avctx) +{ + MPCContext *c = avctx->priv_data; + + memset(c->oldDSCF, 0, sizeof(c->oldDSCF)); + c->frames_to_skip = 32; +} AVCodec mpc7_decoder = { "mpc sv7", @@ -343,4 +357,5 @@ NULL, NULL, mpc7_decode_frame, + .flush = mpc7_decode_flush, }; Modified: trunk/libavformat/mpc.c ============================================================================== --- trunk/libavformat/mpc.c (original) +++ trunk/libavformat/mpc.c Mon Jan 1 06:32:27 2007 @@ -22,6 +22,7 @@ #include "bitstream.h" #define MPC_FRAMESIZE 1152 +#define DELAY_FRAMES 32 static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 }; typedef struct { @@ -155,6 +156,7 @@ pkt->data[1] = (c->curframe > c->fcount); pkt->stream_index = 0; + pkt->pts = cur; ret = get_buffer(&s->pb, pkt->data + 4, size); if(c->curbits) url_fseek(&s->pb, -4, SEEK_CUR); @@ -188,7 +190,7 @@ MPCContext *c = s->priv_data; AVPacket pkt1, *pkt = &pkt1; int ret; - int index = av_index_search_timestamp(st, timestamp, flags); + int index = av_index_search_timestamp(st, timestamp - DELAY_FRAMES, flags); uint32_t lastframe; /* if found, seek there */ @@ -199,6 +201,7 @@ /* if timestamp is out of bounds, return error */ if(timestamp < 0 || timestamp >= c->fcount) return -1; + timestamp -= DELAY_FRAMES; /* seek to the furthest known position and read packets until we reach desired position */ lastframe = c->curframe;

1 0