October 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r10852 - trunk/libavformat/movenc.c
by subversion＠mplayerhq.hu 05 Nov '07

05 Nov '07

Author: benoit Date: Wed Oct 24 16:20:15 2007 New Revision: 10852 Log: Prevent mov muxer from writing empty udta atoms. Modified: trunk/libavformat/movenc.c Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Wed Oct 24 16:20:15 2007 @@ -1220,8 +1220,23 @@ static int mov_write_meta_tag(ByteIOCont static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov, AVFormatContext *s) { + int i, req = 0; + + /* Requirements */ + for (i=0; i<mov->nb_streams; i++) { + if(mov->tracks[i].entry <= 0) continue; + if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC || + mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) { + req = 1; + break; + } + } + + if (s->title[0] || s->author[0] || s->album[0] || s->year || + s->comment[0] || s->genre[0] || s->track || + (mov->mode == MODE_MOV && + ((mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT) || req))) { offset_t pos = url_ftell(pb); - int i; put_be32(pb, 0); /* size */ put_tag(pb, "udta"); @@ -1231,14 +1246,8 @@ static int mov_write_udta_tag(ByteIOCont if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 /* Requirements */ - for (i=0; i<mov->nb_streams; i++) { - if(mov->tracks[i].entry <= 0) continue; - if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC || - mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) { + if (req) mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0); - break; - } - } mov_write_string_tag(pb, "\251nam", s->title , 0); mov_write_string_tag(pb, "\251aut", s->author , 0); @@ -1251,6 +1260,9 @@ static int mov_write_udta_tag(ByteIOCont } return updateSize(pb, pos); + } + + return 0; } static int utf8len(uint8_t *b){

3 2

r10889 - trunk/libavcodec/allcodecs.c
by subversion＠mplayerhq.hu 04 Nov '07

04 Nov '07

Author: michael Date: Wed Oct 31 23:39:10 2007 New Revision: 10889 Log: prefer our native vorbis decoder over libvorbis Modified: trunk/libavcodec/allcodecs.c Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Wed Oct 31 23:39:10 2007 @@ -191,7 +191,6 @@ void avcodec_register_all(void) REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCODER (LIBMP3LAME, libmp3lame); REGISTER_ENCODER (LIBTHEORA, libtheora); - REGISTER_ENCDEC (LIBVORBIS, libvorbis); REGISTER_DECODER (MACE3, mace3); REGISTER_DECODER (MACE6, mace6); REGISTER_ENCDEC (MP2, mp2); @@ -215,6 +214,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (WMAV1, wmav1); REGISTER_ENCDEC (WMAV2, wmav2); REGISTER_DECODER (WS_SND1, ws_snd1); + REGISTER_ENCDEC (LIBVORBIS, libvorbis); /* pcm codecs */ REGISTER_ENCDEC (PCM_ALAW, pcm_alaw);

5 8

r10823 - in trunk/libavformat: rm.h rmdec.c
by subversion＠mplayerhq.hu 01 Nov '07

01 Nov '07

Author: kostya Date: Sun Oct 21 19:17:28 2007 New Revision: 10823 Log: Demux full frames instead of sliced for RealVideo. Some changes by Roberto Togni and blessed by him on IRC. Modified: trunk/libavformat/rm.h trunk/libavformat/rmdec.c Modified: trunk/libavformat/rm.h ============================================================================== --- trunk/libavformat/rm.h (original) +++ trunk/libavformat/rm.h Sun Oct 21 19:17:28 2007 @@ -46,6 +46,11 @@ typedef struct { int old_format; int current_stream; int remaining_len; + uint8_t *videobuf; ///< place to store merged video frame + int videobufsize; ///< current assembled frame size + int videobufpos; ///< position for the next slice in the video buffer + int curpic_num; ///< picture number of current frame + int cur_slice, slices; /// Audio descrambling matrix parameters uint8_t *audiobuf; ///< place to store reordered audio data int64_t audiotimestamp; ///< Audio packet timestamp Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c (original) +++ trunk/libavformat/rmdec.c Sun Oct 21 19:17:28 2007 @@ -350,6 +350,7 @@ skip: if (!rm->nb_packets && (flags & 4)) rm->nb_packets = 3600 * 25; get_be32(pb); /* next data header */ + rm->curpic_num = -1; return 0; fail: @@ -365,6 +366,7 @@ static int get_num(ByteIOContext *pb, in n = get_be16(pb); (*len)-=2; + n &= 0x7FFF; if (n >= 0x4000) { return n - 0x4000; } else { @@ -433,6 +435,89 @@ skip: return -1; } +static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *pkt, int len) +{ + ByteIOContext *pb = &s->pb; + int hdr, seq, pic_num, len2, pos; + int type; + int ssize; + + hdr = get_byte(pb); len--; + type = hdr >> 6; + switch(type){ + case 0: // slice + case 2: // last slice + seq = get_byte(pb); len--; + len2 = get_num(pb, &len); + pos = get_num(pb, &len); + pic_num = get_byte(pb); len--; + rm->remaining_len = len; + break; + case 1: //whole frame + seq = get_byte(pb); len--; + if(av_new_packet(pkt, len + 9) < 0) + return AVERROR(EIO); + pkt->data[0] = 0; + AV_WL32(pkt->data + 1, 1); + AV_WL32(pkt->data + 5, 0); + get_buffer(pb, pkt->data + 9, len); + rm->remaining_len = 0; + return 0; + case 3: //frame as a part of packet + len2 = get_num(pb, &len); + pos = get_num(pb, &len); + pic_num = get_byte(pb); len--; + rm->remaining_len = len - len2; + if(av_new_packet(pkt, len2 + 9) < 0) + return AVERROR(EIO); + pkt->data[0] = 0; + AV_WL32(pkt->data + 1, 1); + AV_WL32(pkt->data + 5, 0); + get_buffer(pb, pkt->data + 9, len2); + return 0; + } + //now we have to deal with single slice + + if((seq & 0x7F) == 1 || rm->curpic_num != pic_num){ + rm->slices = ((hdr & 0x3F) << 1) + 1; + ssize = len2 + 8*rm->slices + 1; + rm->videobuf = av_realloc(rm->videobuf, ssize); + rm->videobufsize = ssize; + rm->videobufpos = 8*rm->slices + 1; + rm->cur_slice = 0; + rm->curpic_num = pic_num; + } + if(type == 2){ + len = FFMIN(len, pos); + pos = len2 - pos; + } + + if(++rm->cur_slice > rm->cur_slice) + return 1; + AV_WL32(rm->videobuf - 7 + 8*rm->cur_slice, 1); + AV_WL32(rm->videobuf - 3 + 8*rm->cur_slice, rm->videobufpos - 8*rm->slices - 1); + if(rm->videobufpos + len > rm->videobufsize) + return 1; + if (get_buffer(pb, rm->videobuf + rm->videobufpos, len) != len) + return AVERROR(EIO); + rm->videobufpos += len, + rm->remaining_len-= len; + + if(type == 2 || (rm->videobufpos) == rm->videobufsize){ + //adjust slice headers + memmove(rm->videobuf + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufsize - 1 - 8*rm->slices); + ssize = rm->videobufsize - 8*(rm->slices - rm->cur_slice); + + rm->videobuf[0] = rm->cur_slice-1; + if(av_new_packet(pkt, ssize) < 0) + return AVERROR(ENOMEM); + memcpy(pkt->data, rm->videobuf, ssize); + return 0; + } + + return 1; +} + static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) { RMContext *rm = s->priv_data; @@ -492,32 +577,9 @@ resync: st = s->streams[i]; if (st->codec->codec_type == CODEC_TYPE_VIDEO) { - int h, pic_num, len2, pos; - - h= get_byte(pb); len--; - if(!(h & 0x40)){ - seq = get_byte(pb); len--; - } - - if((h & 0xc0) == 0x40){ - len2= pos= 0; - }else{ - len2 = get_num(pb, &len); - pos = get_num(pb, &len); - } - /* picture number */ - pic_num= get_byte(pb); len--; - rm->remaining_len= len; rm->current_stream= st->id; - -// av_log(NULL, AV_LOG_DEBUG, "%X len:%d pos:%d len2:%d pic_num:%d\n",h, len, pos, len2, pic_num); - if((h & 0xc0) == 0x80) - len=pos; - if(len2 && len2<len) - len=len2; - rm->remaining_len-= len; - av_get_packet(pb, pkt, len); - + if(rm_assemble_video_frame(s, rm, pkt, len) == 1) + goto resync;//got partial frame } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { if ((st->codec->codec_id == CODEC_ID_RA_288) || (st->codec->codec_id == CODEC_ID_COOK) || @@ -620,6 +682,7 @@ static int rm_read_close(AVFormatContext RMContext *rm = s->priv_data; av_free(rm->audiobuf); + av_free(rm->videobuf); return 0; }

4 6

r10888 - trunk/libavcodec/vorbis_dec.c
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: michael Date: Wed Oct 31 23:36:06 2007 New Revision: 10888 Log: fix issue130 Modified: trunk/libavcodec/vorbis_dec.c Modified: trunk/libavcodec/vorbis_dec.c ============================================================================== --- trunk/libavcodec/vorbis_dec.c (original) +++ trunk/libavcodec/vorbis_dec.c Wed Oct 31 23:36:06 2007 @@ -1006,6 +1006,7 @@ static uint_fast8_t vorbis_floor0_decode if ( book_idx >= vf->num_books ) { av_log( vc->avccontext, AV_LOG_ERROR, "floor0 dec: booknumber too high!\n" ); + book_idx= 0; //FIXME: look above } AV_DEBUG( "floor0 dec: booknumber: %u\n", book_idx );

1 0

r10887 - trunk/libavformat/flvdec.c
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: michael Date: Wed Oct 31 23:10:34 2007 New Revision: 10887 Log: support flv with invalid header fixes issue43 Modified: trunk/libavformat/flvdec.c Modified: trunk/libavformat/flvdec.c ============================================================================== --- trunk/libavformat/flvdec.c (original) +++ trunk/libavformat/flvdec.c Wed Oct 31 23:10:34 2007 @@ -309,8 +309,7 @@ static int flv_read_packet(AVFormatConte } if(i == s->nb_streams){ av_log(NULL, AV_LOG_ERROR, "invalid stream\n"); - url_fseek(&s->pb, next, SEEK_SET); - continue; + st= create_stream(s, is_audio); } // av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard); if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))

1 0

r10886 - trunk/libavformat/flvdec.c
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: michael Date: Wed Oct 31 22:35:50 2007 New Revision: 10886 Log: factorize stream creation Modified: trunk/libavformat/flvdec.c Modified: trunk/libavformat/flvdec.c ============================================================================== --- trunk/libavformat/flvdec.c (original) +++ trunk/libavformat/flvdec.c Wed Oct 31 22:35:50 2007 @@ -224,11 +224,19 @@ static int flv_read_metabody(AVFormatCon return 0; } +static AVStream *create_stream(AVFormatContext *s, int is_audio){ + AVStream *st = av_new_stream(s, is_audio); + if (!st) + return NULL; + st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; + av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ + return st; +} + static int flv_read_header(AVFormatContext *s, AVFormatParameters *ap) { int offset, flags; - AVStream *st; url_fskip(&s->pb, 4); flags = get_byte(&s->pb); @@ -240,18 +248,12 @@ static int flv_read_header(AVFormatConte } if(flags & FLV_HEADER_FLAG_HASVIDEO){ - st = av_new_stream(s, 0); - if (!st) + if(!create_stream(s, 0)) return AVERROR(ENOMEM); - st->codec->codec_type = CODEC_TYPE_VIDEO; - av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ } if(flags & FLV_HEADER_FLAG_HASAUDIO){ - st = av_new_stream(s, 1); - if (!st) + if(!create_stream(s, 1)) return AVERROR(ENOMEM); - st->codec->codec_type = CODEC_TYPE_AUDIO; - av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ } offset = get_be32(&s->pb);

1 0

r10885 - trunk/Makefile
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: diego Date: Wed Oct 31 12:38:08 2007 New Revision: 10885 Log: Remove redundant -DHAVE_AV_CONFIG_H from tests/seek_test command. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Oct 31 12:38:08 2007 @@ -310,7 +310,7 @@ tests/asynth1.sw: tests/audiogen$(EXESUF $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< tests/seek_test$(EXESUF): tests/seek_test.c .libs - $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS) + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS) .PHONY: all lib videohook documentation install* wininstaller uninstall*

1 0

r10884 - trunk/libavformat/siff.c
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: diego Date: Wed Oct 31 12:35:10 2007 New Revision: 10884 Log: Remove unused variables, fixes the following warnings: siff.c:187: warning: unused variable 'snddata' siff.c:186: warning: unused variable 'size2' Modified: trunk/libavformat/siff.c Modified: trunk/libavformat/siff.c ============================================================================== --- trunk/libavformat/siff.c (original) +++ trunk/libavformat/siff.c Wed Oct 31 12:35:10 2007 @@ -183,8 +183,7 @@ static int siff_read_header(AVFormatCont static int siff_read_packet(AVFormatContext *s, AVPacket *pkt) { SIFFContext *c = s->priv_data; - int size, size2; - uint8_t *snddata; + int size; if (c->has_video){ if (c->cur_frame >= c->frames)

1 0

r10883 - trunk/libavformat/udp.c
by subversion＠mplayerhq.hu 31 Oct '07

31 Oct '07

Author: lucabe Date: Wed Oct 31 08:27:38 2007 New Revision: 10883 Log: Take the target address family in account when determining the family of the local address to bind. Fixes ffserver and UDP streaming without --disable-ipv6 on MacOS X Patch by Ronald S. Bultje (rsbultje st gmail dot com) Modified: trunk/libavformat/udp.c Modified: trunk/libavformat/udp.c ============================================================================== --- trunk/libavformat/udp.c (original) +++ trunk/libavformat/udp.c Wed Oct 31 08:27:38 2007 @@ -153,8 +153,11 @@ static int udp_ipv6_set_local(URLContext char sbuf[NI_MAXSERV]; char hbuf[NI_MAXHOST]; struct addrinfo *res0 = NULL, *res = NULL; + int family = AF_UNSPEC; - res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, AF_UNSPEC, AI_PASSIVE); + if (((struct sockaddr *) &s->dest_addr)->sa_family) + family = ((struct sockaddr *) &s->dest_addr)->sa_family; + res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); if (res0 == 0) goto fail; for (res = res0; res; res=res->ai_next) { @@ -277,7 +280,7 @@ static int udp_open(URLContext *h, const is_output = (flags & URL_WRONLY); - s = av_malloc(sizeof(UDPContext)); + s = av_mallocz(sizeof(UDPContext)); if (!s) return AVERROR(ENOMEM);

1 0